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 af1042913..673132073 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 @@ -141,7 +141,7 @@ public class SentinelItemModel extends GeoModel { 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) { + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0 || stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { main.setRotX(numR * main.getRotX()); main.setRotY(numR * main.getRotY()); main.setRotZ(numR * main.getRotZ()); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java index 74065a382..78f6f3cee 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/AK47Item.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -66,8 +67,8 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java index 317c5372a..b1512ba2f 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Aa12Item.java @@ -8,7 +8,9 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.RarityTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -65,8 +67,8 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java index 36084111f..363d48c79 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Abekiri.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -67,8 +68,8 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java index be8f86759..475d16d05 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Devotion.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -61,8 +62,8 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Glock17Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Glock17Item.java index 2e7516c2d..966fad96d 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Glock17Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Glock17Item.java @@ -65,8 +65,8 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Glock18Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Glock18Item.java index 8a6c6eda5..d33784e89 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Glock18Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Glock18Item.java @@ -65,8 +65,8 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java index 36ec44c49..d17cbb43c 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Hk416Item.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -61,8 +62,8 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java index e0d22559f..506aac1ae 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/HuntingRifle.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -66,8 +67,8 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/K98Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/K98Item.java index 9abb6c6d8..292ff8500 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/K98Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/K98Item.java @@ -65,8 +65,8 @@ public class K98Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M1911Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M1911Item.java index e691e1c2b..8ff7beac0 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M1911Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M1911Item.java @@ -65,8 +65,8 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java index 8b6983394..4940b5c24 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M4Item.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -61,8 +62,8 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java index 94620b538..541b92bd1 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M60Item.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -61,8 +62,8 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java index 7b74e578e..be6b8c540 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M79Item.java @@ -69,8 +69,8 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java index 6680e3335..e9f7b8f61 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M870Item.java @@ -63,8 +63,8 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java index 9e164536c..bf310aa81 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/M98bItem.java @@ -62,8 +62,8 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } 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 95c56439b..720e34d98 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/MarlinItem.java @@ -63,8 +63,8 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java index 886bdc49c..7e7471e17 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Minigun.java @@ -85,11 +85,10 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem { private static final HumanoidModel.ArmPose MinigunPose = HumanoidModel.ArmPose.create("Minigun", false, (model, entity, arm) -> { if (arm != HumanoidArm.LEFT) { - model.rightArm.xRot = -0.2F + model.head.xRot; - model.rightArm.yRot = -0.2F; - model.leftArm.xRot = -1F + model.head.xRot; - model.leftArm.yRot = 1F; - model.leftArm.zRot = -0.5F; + model.rightArm.xRot = -22.5f * Mth.DEG_TO_RAD + model.head.xRot; + model.rightArm.yRot = -10f * Mth.DEG_TO_RAD; + model.leftArm.xRot = -45f * Mth.DEG_TO_RAD + model.head.xRot; + model.leftArm.yRot = 40f * Mth.DEG_TO_RAD; } }); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java index 80c7618aa..717f0ced2 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Mk14Item.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -17,7 +18,6 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; -import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; @@ -62,8 +62,8 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java index c4144954c..9a65a67a8 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java @@ -75,8 +75,8 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Qbz95Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Qbz95Item.java index 23fa08e3b..4c66774e4 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Qbz95Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Qbz95Item.java @@ -65,8 +65,8 @@ public class Qbz95Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java index 75120d1b1..f414b91a2 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/RpgItem.java @@ -64,8 +64,8 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java index 9cfa03cd3..fcfb61b0d 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/RpkItem.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -61,8 +62,8 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java index 8edc60926..b57abac65 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/SentinelItem.java @@ -110,8 +110,8 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } @@ -144,7 +144,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload_normal")); } - if (stack.getOrCreateTag().getDouble("sentinel_charge_time") < 127 && stack.getOrCreateTag().getDouble("sentinel_charge_time") > 0 && stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { + if (stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.charge")); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java index c107a9bdf..94558e21e 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/SksItem.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -66,8 +67,8 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java index a5e531b5e..d29641ba7 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/SvdItem.java @@ -8,7 +8,8 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -61,8 +62,8 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java index 951617a09..d057062b2 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Taser.java @@ -9,7 +9,10 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.EnchantmentCategoryTool; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.ItemNBTTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -89,8 +92,8 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java index 8bd9bbb49..e2d951942 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Trachelium.java @@ -8,7 +8,9 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.tools.*; +import net.mcreator.superbwarfare.tools.GunsTool; +import net.mcreator.superbwarfare.tools.RarityTool; +import net.mcreator.superbwarfare.tools.TooltipTool; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; @@ -72,8 +74,8 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java index 9054aa26f..49f9dc2b5 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/VectorItem.java @@ -62,8 +62,8 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { } @Override - public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) { - return HumanoidModel.ArmPose.BOW_AND_ARROW; + public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + return GunsTool.pose(entityLiving, hand, stack); } }); } diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java index 604f22d98..5fcc6c00f 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/FireModeMessage.java @@ -3,7 +3,6 @@ package net.mcreator.superbwarfare.network.message; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; -import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.core.Holder; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; @@ -97,11 +96,9 @@ public class FireModeMessage { } } - var capability = player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()); if (mainHandItem.getItem() == ModItems.SENTINEL.get() && !player.isSpectator() - && !capability.zooming && !(player.getCooldowns().isOnCooldown(mainHandItem.getItem())) && mainHandItem.getOrCreateTag().getInt("gun_reloading_time") == 0 && !mainHandItem.getOrCreateTag().getBoolean("sentinel_is_charging")) { diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java index c7ddeeaae..b101da299 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/ReloadMessage.java @@ -48,8 +48,7 @@ public class ReloadMessage { if (!player.isSpectator() && stack.is(ModTags.Items.GUN) -// && !capability.zooming - && !stack.getOrCreateTag().getBoolean("charging") + && !stack.getOrCreateTag().getBoolean("sentinel_is_charging") && !(player.getCooldowns().isOnCooldown(stack.getItem())) && stack.getOrCreateTag().getInt("gun_reloading_time") == 0 ) { diff --git a/src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java b/src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java index 93e8101cf..a2340956b 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/GunsTool.java @@ -4,10 +4,15 @@ import com.google.gson.stream.JsonReader; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.network.message.GunsDataMessage; +import net.minecraft.client.model.HumanoidModel; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.HumanoidArm; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -137,4 +142,46 @@ public class GunsTool { tag.putBoolean("is_normal_reloading", false); tag.putBoolean("is_empty_reloading", false); } + + public static HumanoidModel.ArmPose pose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading") + || stack.getOrCreateTag().getBoolean("is_normal_reloading") + || stack.getOrCreateTag().getBoolean("reloading") + || stack.getOrCreateTag().getBoolean("sentinel_is_charging")) { + return ReloadPose; + } else if (entityLiving.isSprinting() && entityLiving.onGround() && entityLiving.getPersistentData().getDouble("noRun") == 0) { + if (entityLiving.hasEffect(MobEffects.MOVEMENT_SPEED)) { + return TacticalSprintPose; + } else { + return SprintPose; + } + } else { + return HumanoidModel.ArmPose.BOW_AND_ARROW; + } + } + + private static final HumanoidModel.ArmPose ReloadPose = HumanoidModel.ArmPose.create("ReloadPose", false, (model, entity, arm) -> { + if (arm == HumanoidArm.RIGHT) { + model.rightArm.xRot = -45F * Mth.DEG_TO_RAD; + model.rightArm.yRot = model.head.yRot - 22.5F * Mth.DEG_TO_RAD; + model.leftArm.xRot = -60F * Mth.DEG_TO_RAD; + model.leftArm.yRot = model.head.yRot + 22.5F * Mth.DEG_TO_RAD; + } + }); + + private static final HumanoidModel.ArmPose SprintPose = HumanoidModel.ArmPose.create("SprintPose", false, (model, entity, arm) -> { + if (arm == HumanoidArm.RIGHT) { + model.rightArm.xRot = -45F * Mth.DEG_TO_RAD; + model.rightArm.yRot = model.head.yRot - 50F * Mth.DEG_TO_RAD; + model.leftArm.xRot = -45F * Mth.DEG_TO_RAD; + model.leftArm.yRot = model.head.yRot + 22.5F * Mth.DEG_TO_RAD; + } + }); + + private static final HumanoidModel.ArmPose TacticalSprintPose = HumanoidModel.ArmPose.create("TacticalSprintPose", false, (model, entity, arm) -> { + if (arm == HumanoidArm.RIGHT) { + model.rightArm.xRot = 0.2f * model.rightArm.xRot -155F * Mth.DEG_TO_RAD; + model.rightArm.zRot = -5F * Mth.DEG_TO_RAD; + } + }); } diff --git a/src/main/resources/assets/superbwarfare/models/item/minigun3d.json b/src/main/resources/assets/superbwarfare/models/item/minigun3d.json index 742fff12f..b1807dca3 100644 --- a/src/main/resources/assets/superbwarfare/models/item/minigun3d.json +++ b/src/main/resources/assets/superbwarfare/models/item/minigun3d.json @@ -674,7 +674,7 @@ "gui_light": "front", "display": { "thirdperson_righthand": { - "rotation": [75, -9, 0], + "rotation": [67.5, -10, 0], "translation": [0.25, 3.5, -0.25], "scale": [0.7, 0.7, 0.7] },