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 43f8eb11d..b23678ebe 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 @@ -55,13 +55,8 @@ public class AK47ItemModel extends GeoModel { CoreGeoBone holo = getAnimationProcessor().getBone("holo"); CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - if (gun.getPosX() > 1.8) { - holo.setScaleX(1); - holo.setScaleY(1); - } else { - holo.setScaleX(0); - holo.setScaleY(0); - } + + holo.setHidden(!(gun.getPosX() > 1.8)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); @@ -83,13 +78,12 @@ public class AK47ItemModel extends GeoModel { shuan.setPosZ(2.4f * (float) fp); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 ae2437a31..a7d24bc74 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 @@ -68,13 +68,12 @@ public class Aa12ItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 a462f0d9b..f0789eb68 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 @@ -66,13 +66,12 @@ public class AbekiriItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 5dd926538..d8bd42768 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 @@ -93,13 +93,12 @@ public class DevotionItemModel extends GeoModel { shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } 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 b351778bc..f9e3ce233 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 @@ -43,13 +43,12 @@ public class Hk416ItemModel extends GeoModel { if (!stack.is(ModTags.Items.GUN)) return; if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } double p = player.getPersistentData().getDouble("zoom_pos"); @@ -62,13 +61,7 @@ public class Hk416ItemModel extends GeoModel { scope.setScaleZ(1f - (0.5f * (float) p)); - if (gun.getPosX() > 3.1) { - holo.setScaleX(1); - holo.setScaleY(1); - } else { - holo.setScaleX(0); - holo.setScaleY(0); - } + holo.setHidden(!(gun.getPosX() > 3.1)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); 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 8e8cd0a1d..92649c016 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 @@ -67,13 +67,12 @@ public class HuntingRifleItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 d6d345f87..0950d29ae 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 @@ -74,13 +74,12 @@ public class M4ItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 2ebce28b0..50ed49a72 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 @@ -117,13 +117,12 @@ public class M60ItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 f4984e838..2201cfa63 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 @@ -55,14 +55,13 @@ public class M79ItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - if (stack.getOrCreateTag().getInt("fire_animation") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + if (stack.getOrCreateTag().getDouble("flash_time") > 0) { + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } double fp = player.getPersistentData().getDouble("fire_pos"); 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 20e579185..a44baffc3 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 @@ -33,7 +33,6 @@ public class M870ItemModel extends GeoModel { public void setCustomAnimations(M870Item animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - CoreGeoBone shell = getAnimationProcessor().getBone("shell"); Player player = Minecraft.getInstance().player; if (player == null) return; @@ -72,13 +71,12 @@ public class M870ItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 70881dcfc..9d7b9d272 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 @@ -56,11 +56,8 @@ public class M98bItemModel extends GeoModel { } shen.setPosX(0.5f * (float)fr * (float)((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).recoilHorizon * fp)); - double p = 0; - p = player.getPersistentData().getDouble("zoom_pos"); - - double zp = 0; - zp = player.getPersistentData().getDouble("zoom_pos_z"); + double p = player.getPersistentData().getDouble("zoom_pos"); + double zp = player.getPersistentData().getDouble("zoom_pos_z"); gun.setPosX(2.245f * (float) p); @@ -74,25 +71,20 @@ public class M98bItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); CoreGeoBone qiang = getAnimationProcessor().getBone("qiang"); if (gun.getPosX() > 1.9) { - holo.setScaleX(1); - holo.setScaleY(1); - qiang.setScaleX(0); - qiang.setScaleY(0); + holo.setHidden(false); + qiang.setHidden(true); } else { - holo.setScaleX(0); - holo.setScaleY(0); - qiang.setScaleX(1); - qiang.setScaleY(1); + holo.setHidden(true); + qiang.setHidden(false); } if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); @@ -101,10 +93,8 @@ public class M98bItemModel extends GeoModel { float PosX = (float)player.getPersistentData().getDouble("gun_move_posX"); float PosY = (float)player.getPersistentData().getDouble("gun_move_posY"); - double y = 0; - double x = 0; - y = player.getPersistentData().getDouble("y"); - x = player.getPersistentData().getDouble("x"); + double y = player.getPersistentData().getDouble("y"); + double x = player.getPersistentData().getDouble("x"); root.setPosX(PosX); 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 d2750d1ab..0d0e69588 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 @@ -72,13 +72,12 @@ public class MarlinItemModel extends GeoModel { } if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 8e5ae17ca..6c7a0ae00 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 @@ -114,13 +114,12 @@ public class Mk14ItemModel extends GeoModel { } if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 d1f6d6a4e..eb70decab 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 @@ -100,13 +100,12 @@ public class Ntw20Model extends GeoModel { } if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 3e978ebcf..c07105a23 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 @@ -70,21 +70,11 @@ public class RpkItemModel extends GeoModel { CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - if (gun.getPosX() > 1.65f) { - holo.setScaleX(0.9f); - holo.setScaleY(0.9f); - hide.setScaleX(0); - hide.setScaleY(0); - hide.setScaleZ(0); - } else { - holo.setScaleX(0); - holo.setScaleY(0); - hide.setScaleX(1); - hide.setScaleY(1); - hide.setScaleZ(1); + holo.setScaleX(0.9f); + holo.setScaleY(0.9f); - } + holo.setHidden(!(gun.getPosX() > 1.65)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); @@ -105,13 +95,12 @@ public class RpkItemModel extends GeoModel { shuan.setPosZ(2.4f * (float) fp); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 26118d31d..cbf17d4db 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 @@ -70,14 +70,8 @@ public class SentinelItemModel extends GeoModel { cb.setRotZ(cb.getRotZ() + times * 0.03f * (float) (stack.getOrCreateTag().getDouble("chamber_rot"))); CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - if (gun.getPosX() > 1.8) { - holo.setPosY(0.09f); - holo.setScaleX(1); - holo.setScaleY(1); - } else { - holo.setScaleX(0); - holo.setScaleY(0); - } + holo.setPosY(0.09f); + holo.setHidden(!(gun.getPosX() > 1.8)); double fp = player.getPersistentData().getDouble("fire_pos"); double fr = player.getPersistentData().getDouble("fire_rot"); @@ -104,13 +98,7 @@ public class SentinelItemModel extends GeoModel { iEnergyStorage -> flag.set(iEnergyStorage.getEnergyStored() > 0) ); - if (flag.get()) { - charge.setScaleX(1); - charge.setScaleY(1); - } else { - charge.setScaleX(0); - charge.setScaleY(0); - } + charge.setHidden(!flag.get()); CoreGeoBone root = getAnimationProcessor().getBone("root"); @@ -157,13 +145,12 @@ public class SentinelItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } if ((stack.getOrCreateTag().getDouble("ammo") <= 5)) { 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 5b01078de..70da60349 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 @@ -61,13 +61,8 @@ public class SksItemModel extends GeoModel { gun.setRotZ((float) (0.05f * zp)); CoreGeoBone holo = getAnimationProcessor().getBone("holo"); - if (gun.getPosX() > 1.2) { - holo.setScaleX(1); - holo.setScaleY(1); - } else { - holo.setScaleX(0); - holo.setScaleY(0); - } + + holo.setHidden(!(gun.getPosX() > 1.2)); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); @@ -90,13 +85,12 @@ public class SksItemModel extends GeoModel { shuan.setPosZ(2f * (float) fp); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 e6578dc99..658885768 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 @@ -77,16 +77,12 @@ public class SvdItemModel extends GeoModel { holo.setPosY(0.05f); holo.setScaleX(0.45f); holo.setScaleY(0.45f); - sight.setScaleX(0f); - sight.setScaleY(0f); + holo.setHidden(false); + sight.setHidden(true); } else { - holo.setPosY(0); - holo.setScaleX(0); - holo.setScaleY(0); - sight.setScaleX(1f); - sight.setScaleY(1f); - glass.setScaleX(0); - glass.setScaleY(0); + holo.setHidden(true); + sight.setHidden(false); + glass.setHidden(true); } CoreGeoBone shen = getAnimationProcessor().getBone("shen"); @@ -112,13 +108,12 @@ public class SvdItemModel extends GeoModel { holo.setRotZ(-0.04f * (float) fp); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root"); 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 cbebd1aa5..1f62dd4b2 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 @@ -67,13 +67,12 @@ public class TracheliumItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); + flare.setHidden(false); + flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); } else { - flare.setScaleX(0); - flare.setScaleY(0); - flare.setRotZ(0); + flare.setHidden(true); } CoreGeoBone root = getAnimationProcessor().getBone("root");