From b8c87ef8ba95a6ccf7cd9cd3dff84471328c9ce8 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 6 Jul 2024 23:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8D=A2=E5=BC=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/M60ItemModel.java | 10 +- .../client/model/item/Mk14ItemModel.java | 2 +- .../client/model/item/SksItemModel.java | 2 +- .../client/model/item/SvdItemModel.java | 2 +- .../target/event/GunEventHandler.java | 67 ++++- .../mcreator/target/init/TargetModSounds.java | 10 +- .../net/mcreator/target/item/gun/Abekiri.java | 60 +---- .../mcreator/target/item/gun/Devotion.java | 61 +---- .../net/mcreator/target/item/gun/GunItem.java | 34 ++- .../mcreator/target/item/gun/Hk416Item.java | 63 +---- .../target/item/gun/HuntingRifle.java | 42 +-- .../net/mcreator/target/item/gun/Kraber.java | 60 +---- .../net/mcreator/target/item/gun/M4Item.java | 60 +---- .../net/mcreator/target/item/gun/M60Item.java | 66 +---- .../net/mcreator/target/item/gun/M79Item.java | 36 +-- .../mcreator/target/item/gun/M98bItem.java | 60 +---- .../mcreator/target/item/gun/Mk14Item.java | 62 +---- .../net/mcreator/target/item/gun/RpgItem.java | 43 +-- .../net/mcreator/target/item/gun/RpkItem.java | 61 +---- .../target/item/gun/SentinelItem.java | 109 +------- .../net/mcreator/target/item/gun/SksItem.java | 62 +---- .../net/mcreator/target/item/gun/SvdItem.java | 62 +---- .../net/mcreator/target/item/gun/Taser.java | 42 +-- .../mcreator/target/item/gun/Trachelium.java | 41 +-- .../mcreator/target/item/gun/VectorItem.java | 4 +- .../network/message/FireModeMessage.java | 7 - .../target/network/message/ReloadMessage.java | 17 +- .../procedures/PlayerReloadProcedure.java | 255 ------------------ src/main/resources/assets/target/sounds.json | 10 +- .../resources/data/target/guns/abekiri.json | 4 +- .../resources/data/target/guns/devotion.json | 4 +- .../resources/data/target/guns/hk_416.json | 4 +- .../data/target/guns/hunting_rifle.json | 3 +- .../resources/data/target/guns/kraber.json | 4 +- src/main/resources/data/target/guns/m_4.json | 4 +- src/main/resources/data/target/guns/m_60.json | 4 +- src/main/resources/data/target/guns/m_79.json | 3 +- .../resources/data/target/guns/m_98b.json | 4 +- .../resources/data/target/guns/mk_14.json | 4 +- src/main/resources/data/target/guns/rpg.json | 3 +- src/main/resources/data/target/guns/rpk.json | 4 +- .../resources/data/target/guns/sentinel.json | 4 +- src/main/resources/data/target/guns/sks.json | 4 +- src/main/resources/data/target/guns/svd.json | 4 +- .../resources/data/target/guns/taser.json | 3 +- .../data/target/guns/trachelium.json | 3 +- .../resources/data/target/guns/vector.json | 4 +- .../data/target/tags/items/open_bolt.json | 2 + 48 files changed, 205 insertions(+), 1274 deletions(-) diff --git a/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java index d9af0656a..4382044ed 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M60ItemModel.java @@ -51,31 +51,31 @@ public class M60ItemModel extends GeoModel { r.setRotX(1.5f); } - if (stack.getOrCreateTag().getInt("ammo") < 5 && stack.getOrCreateTag().getDouble("empty") == 1) { + if (stack.getOrCreateTag().getInt("ammo") < 5 && stack.getOrCreateTag().getBoolean("bullet_chain")) { b5.setScaleX(0); b5.setScaleY(0); b5.setScaleZ(0); } - if (stack.getOrCreateTag().getInt("ammo") < 4 && stack.getOrCreateTag().getDouble("empty") == 1) { + if (stack.getOrCreateTag().getInt("ammo") < 4 && stack.getOrCreateTag().getBoolean("bullet_chain")) { b4.setScaleX(0); b4.setScaleY(0); b4.setScaleZ(0); } - if (stack.getOrCreateTag().getInt("ammo") < 3 && stack.getOrCreateTag().getDouble("empty") == 1) { + if (stack.getOrCreateTag().getInt("ammo") < 3 && stack.getOrCreateTag().getBoolean("bullet_chain")) { b3.setScaleX(0); b3.setScaleY(0); b3.setScaleZ(0); } - if (stack.getOrCreateTag().getInt("ammo") < 2 && stack.getOrCreateTag().getDouble("empty") == 1) { + if (stack.getOrCreateTag().getInt("ammo") < 2 && stack.getOrCreateTag().getBoolean("bullet_chain")) { b2.setScaleX(0); b2.setScaleY(0); b2.setScaleZ(0); } - if (stack.getOrCreateTag().getInt("ammo") < 1 && stack.getOrCreateTag().getDouble("empty") == 1) { + if (stack.getOrCreateTag().getInt("ammo") < 1 && stack.getOrCreateTag().getBoolean("bullet_chain")) { b1.setScaleX(0); b1.setScaleY(0); b1.setScaleZ(0); diff --git a/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java index 7f071db34..e85eb5012 100644 --- a/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/Mk14ItemModel.java @@ -108,7 +108,7 @@ public class Mk14ItemModel extends GeoModel { CoreGeoBone bolt = getAnimationProcessor().getBone("bolt"); - if (stack.getOrCreateTag().getDouble("HoldOpen") == 1) { + if (stack.getOrCreateTag().getBoolean("HoldOpen")) { bolt.setPosZ(2.5f); } diff --git a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java index a438aa8b7..d6b7b9503 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java @@ -41,7 +41,7 @@ public class SksItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(TargetModTags.Items.GUN)) return; - if (stack.getOrCreateTag().getDouble("HoldOpen") == 1) { + if (stack.getOrCreateTag().getBoolean("HoldOpen")) { bolt.setPosZ(2.5f); } diff --git a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java index 5ab4e9784..ead5def9b 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java @@ -45,7 +45,7 @@ public class SvdItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (!stack.is(TargetModTags.Items.GUN)) return; - if (stack.getOrCreateTag().getDouble("HoldOpen") == 1) { + if (stack.getOrCreateTag().getBoolean("HoldOpen")) { bolt.setPosZ(3.25f); } diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 3e1c0a462..ad34916c8 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -89,7 +89,7 @@ public class GunEventHandler { 空仓挂机 */ if (stack.getOrCreateTag().getInt("ammo") == 1) { - stack.getOrCreateTag().putDouble("HoldOpen", 1); + stack.getOrCreateTag().putBoolean("HoldOpen", true); } /* @@ -103,8 +103,13 @@ public class GunEventHandler { stack.getOrCreateTag().putInt("fire_animation", interval); player.getPersistentData().putInt("noRun_time", interval + 2); stack.getOrCreateTag().putDouble("flash_time", 2); + stack.getOrCreateTag().putDouble("empty", 1); + if (player.getMainHandItem().getItem() == TargetModItems.M_60.get()) { + stack.getOrCreateTag().putBoolean("bullet_chain", true); + } + if (player.getMainHandItem().getItem() == TargetModItems.M_4.get() || player.getMainHandItem().getItem() == TargetModItems.HK_416.get()) { if (stack.getOrCreateTag().getDouble("fire_sequence") == 1) { stack.getOrCreateTag().putDouble("fire_sequence", 0); @@ -361,9 +366,9 @@ public class GunEventHandler { playGunNormalReloadSounds(player); } } else { - tag.putInt("gun_reloading_time",(int)tag.getDouble("normal_reload_time")); - stack.getOrCreateTag().putBoolean("is_normal_reloading",true); - playGunNormalReloadSounds(player); + tag.putInt("gun_reloading_time",(int)tag.getDouble("empty_reload_time")); + stack.getOrCreateTag().putBoolean("is_empty_reloading",true); + playGunEmptyReloadSounds(player); } tag.putBoolean("start_reload",false); } @@ -372,6 +377,34 @@ public class GunEventHandler { tag.putInt("gun_reloading_time",tag.getInt("gun_reloading_time") - 1); } + if (stack.getItem() == TargetModItems.RPG.get()) { + if (tag.getInt("gun_reloading_time") == 84) { + tag.putBoolean("empty", false); + } + if (tag.getInt("gun_reloading_time") == 7) { + tag.putBoolean("close_hammer", false); + } + + } + + if (stack.getItem() == TargetModItems.MK_14.get()) { + if (tag.getInt("gun_reloading_time") == 18) { + tag.putBoolean("HoldOpen", false); + } + } + + if (stack.getItem() == TargetModItems.SKS.get()) { + if (tag.getInt("gun_reloading_time") == 14) { + tag.putBoolean("HoldOpen", false); + } + } + + if (stack.getItem() == TargetModItems.M_60.get()) { + if (tag.getInt("gun_reloading_time") == 55) { + tag.putBoolean("bullet_chain", false); + } + } + if (tag.getInt("gun_reloading_time") == 1) { if (stack.is(TargetModTags.Items.OPEN_BOLT)) { if(tag.getInt("ammo") == 0) { @@ -389,14 +422,24 @@ public class GunEventHandler { ItemStack stack = player.getMainHandItem(); if (stack.is(TargetModTags.Items.SHOTGUN)) { - GunsTool.reload(player, GunInfo.Type.SHOTGUN ,true); + if (stack.getItem() == TargetModItems.ABEKIRI.get()) { + GunsTool.reload(player, GunInfo.Type.SHOTGUN); + } else { + GunsTool.reload(player, GunInfo.Type.SHOTGUN ,true); + } } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { GunsTool.reload(player, GunInfo.Type.SNIPER ,true); } else if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { GunsTool.reload(player, GunInfo.Type.HANDGUN ,true); } else if (stack.is(TargetModTags.Items.RIFLE)) { - GunsTool.reload(player, GunInfo.Type.RIFLE ,true); + if (stack.getItem() == TargetModItems.M_60.get()) { + GunsTool.reload(player, GunInfo.Type.RIFLE); + } else { + GunsTool.reload(player, GunInfo.Type.RIFLE ,true); + } } + stack.getOrCreateTag().putBoolean("is_normal_reloading", false); + stack.getOrCreateTag().putBoolean("is_empty_reloading", false); } public static void playGunEmptyReload(Player player) { @@ -410,7 +453,19 @@ public class GunEventHandler { GunsTool.reload(player, GunInfo.Type.HANDGUN); } else if (stack.is(TargetModTags.Items.RIFLE)) { GunsTool.reload(player, GunInfo.Type.RIFLE); + } else if (stack.getItem() == TargetModItems.TASER.get()) { + stack.getOrCreateTag().putInt("ammo", 1); + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.TASER_ELECTRODE.get(), 1, player.inventoryMenu.getCraftSlots()); + } else if (stack.getItem() == TargetModItems.M_79.get()) { + stack.getOrCreateTag().putInt("ammo", 1); + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.GRENADE_40MM.get(), 1, player.inventoryMenu.getCraftSlots()); + } else if (stack.getItem() == TargetModItems.RPG.get()) { + stack.getOrCreateTag().putInt("ammo", 1); + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.ROCKET.get(), 1, player.inventoryMenu.getCraftSlots()); } + + stack.getOrCreateTag().putBoolean("is_normal_reloading", false); + stack.getOrCreateTag().putBoolean("is_empty_reloading", false); } public static void playGunEmptyReloadSounds(Player player) { diff --git a/src/main/java/net/mcreator/target/init/TargetModSounds.java b/src/main/java/net/mcreator/target/init/TargetModSounds.java index 01fc0f30d..ccbdbf923 100644 --- a/src/main/java/net/mcreator/target/init/TargetModSounds.java +++ b/src/main/java/net/mcreator/target/init/TargetModSounds.java @@ -13,14 +13,14 @@ public class TargetModSounds { public static final RegistryObject TASER_FIRE_1P = REGISTRY.register("taser_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_fire_1p"))); public static final RegistryObject TASER_FIRE_3P = REGISTRY.register("taser_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_fire_3p"))); - public static final RegistryObject TASER_RELOAD = REGISTRY.register("taser_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_reload"))); + public static final RegistryObject TASER_RELOAD_EMPTY = REGISTRY.register("taser_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_reload_empty"))); public static final RegistryObject SHOCK = REGISTRY.register("shock", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "shock"))); public static final RegistryObject ELECTRIC = REGISTRY.register("electric", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "electric"))); public static final RegistryObject TRACHELIUM_FIRE_1P = REGISTRY.register("trachelium_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_1p"))); public static final RegistryObject TRACHELIUM_FIRE_3P = REGISTRY.register("trachelium_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_3p"))); public static final RegistryObject TRACHELIUM_FAR = REGISTRY.register("trachelium_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_far"))); public static final RegistryObject TRACHELIUM_VERYFAR = REGISTRY.register("trachelium_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_veryfar"))); - public static final RegistryObject TRACHELIUM_RELOAD = REGISTRY.register("trachelium_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_reload"))); + public static final RegistryObject TRACHELIUM_RELOAD_EMPTY = REGISTRY.register("trachelium_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_reload_empty"))); public static final RegistryObject TRIGGER_CLICK = REGISTRY.register("triggerclick", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "triggerclick"))); public static final RegistryObject HIT = REGISTRY.register("hit", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hit"))); public static final RegistryObject TARGET_DOWN = REGISTRY.register("targetdown", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "targetdown"))); @@ -35,7 +35,7 @@ public class TargetModSounds { public static final RegistryObject HUNTING_RIFLE_FIRE_3P = REGISTRY.register("hunting_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_fire_3p"))); public static final RegistryObject HUNTING_RIFLE_FAR = REGISTRY.register("hunting_rifle_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_far"))); public static final RegistryObject HUNTING_RIFLE_VERYFAR = REGISTRY.register("hunting_rifle_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_veryfar"))); - public static final RegistryObject HUNTING_RIFLE_RELOAD = REGISTRY.register("hunting_rifle_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_reload"))); + public static final RegistryObject HUNTING_RIFLE_RELOAD_EMPTY = REGISTRY.register("hunting_rifle_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_reload_empty"))); public static final RegistryObject OUCH = REGISTRY.register("ouch", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ouch"))); public static final RegistryObject STEP = REGISTRY.register("step", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "step"))); public static final RegistryObject GROWL = REGISTRY.register("growl", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "growl"))); @@ -44,7 +44,7 @@ public class TargetModSounds { public static final RegistryObject M_79_FIRE_3P = REGISTRY.register("m_79_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_fire_3p"))); public static final RegistryObject M_79_FAR = REGISTRY.register("m_79_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_far"))); public static final RegistryObject M_79_VERYFAR = REGISTRY.register("m_79_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_veryfar"))); - public static final RegistryObject M_79_RELOAD = REGISTRY.register("m_79_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_reload"))); + public static final RegistryObject M_79_RELOAD_EMPTY = REGISTRY.register("m_79_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_reload_empty"))); public static final RegistryObject SKS_FIRE_1P = REGISTRY.register("sks_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_fire_1p"))); public static final RegistryObject SKS_FIRE_3P = REGISTRY.register("sks_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_fire_3p"))); public static final RegistryObject SKS_RELOAD_NORMAL = REGISTRY.register("sks_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_reload_normal"))); @@ -76,7 +76,7 @@ public class TargetModSounds { public static final RegistryObject RPG_FIRE_3P = REGISTRY.register("rpg_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_fire_3p"))); public static final RegistryObject RPG_FAR = REGISTRY.register("rpg_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_far"))); public static final RegistryObject RPG_VERYFAR = REGISTRY.register("rpg_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_veryfar"))); - public static final RegistryObject RPG_RELOAD = REGISTRY.register("rpg_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_reload"))); + public static final RegistryObject RPG_RELOAD_EMPTY = REGISTRY.register("rpg_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_reload_empty"))); public static final RegistryObject MORTAR_FIRE = REGISTRY.register("mortar_fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_fire"))); public static final RegistryObject MORTAR_LOAD = REGISTRY.register("mortar_load", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_load"))); public static final RegistryObject MORTAR_DISTANT = REGISTRY.register("mortar_distant", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_distant"))); diff --git a/src/main/java/net/mcreator/target/item/gun/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java index 1efcc7989..79faa7282 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -94,11 +94,11 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload2")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload")); } @@ -164,62 +164,6 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addShotgunTips(list, stack, 8); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 99) { - entity.getPersistentData().putDouble("id", id); - if (!entity.level().isClientSide()) { - SoundTool.playLocalSound(player, TargetModSounds.ABEKIRI_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SHOTGUN); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") == 1) { - if (tag.getDouble("reload_time") == 83) { - entity.getPersistentData().putDouble("id", id); - if (!entity.level().isClientSide()) { - SoundTool.playLocalSound(player, TargetModSounds.ABEKIRI_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SHOTGUN); - } - } - } - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.ABEKIRI.get()); GunsTool.initCreativeGun(stack, TargetModItems.ABEKIRI.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index 9c9232452..2e9e8a4bf 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -89,11 +89,11 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload_normal")); } @@ -159,63 +159,6 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemstack, world, entity, slot, selected); - - var itemTag = itemstack.getOrCreateTag(); - var id = itemTag.getDouble("id"); - var mainHandItem = entity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY; - var mainHandItemTag = mainHandItem.getOrCreateTag(); - - if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) { - itemTag.putBoolean("empty_reload", false); - itemTag.putBoolean("reloading", false); - itemTag.putDouble("reload_time", 0); - } - if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") == 0) { - if (itemTag.getDouble("reload_time") == 92) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer player) { - SoundTool.playLocalSound(player, TargetModSounds.DEVOTION_RELOAD_EMPTY.get(), 100, 1); - } - } - if (mainHandItem.getItem() == itemstack.getItem() - && mainHandItemTag.getDouble("id") == id) { - if (itemTag.getDouble("reload_time") > 0) { - itemTag.putDouble("reload_time", itemTag.getDouble("reload_time") - 1); - } - } else { - itemTag.putBoolean("reloading", false); - itemTag.putBoolean("empty_reload", false); - itemTag.putDouble("reload_time", 0); - } - if (itemTag.getDouble("reload_time") == 1 && mainHandItemTag.getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } else if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") > 0) { - if (itemTag.getDouble("reload_time") == 70) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer player) { - SoundTool.playLocalSound(player, TargetModSounds.DEVOTION_RELOAD_NORMAL.get(), 100, 1); - } - } - if (mainHandItem.getItem() == itemstack.getItem() - && mainHandItemTag.getDouble("id") == id) { - if (itemTag.getDouble("reload_time") > 0) { - itemTag.putDouble("reload_time", (itemTag.getDouble("reload_time") - 1)); - } - } else { - itemTag.putBoolean("reloading", false); - itemTag.putBoolean("empty_reload", false); - itemTag.putDouble("reload_time", 0); - } - if (itemTag.getDouble("reload_time") == 1 && mainHandItemTag.getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE, true); - } - } - } - @Override public Set getReloadSound() { return Set.of(TargetModSounds.DEVOTION_RELOAD_EMPTY.get(), TargetModSounds.DEVOTION_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java index adffe7ad4..6c870e6d4 100644 --- a/src/main/java/net/mcreator/target/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java @@ -44,8 +44,6 @@ public abstract class GunItem extends Item { return; } - CompoundTag tag = itemstack.getOrCreateTag(); - if (!ItemNBTTool.getBoolean(itemstack, "init", false)) { GunsTool.initGun(level, itemstack, this.getDescriptionId().substring(this.getDescriptionId().lastIndexOf('.') + 1)); GunsTool.genUUID(itemstack); @@ -53,16 +51,16 @@ public abstract class GunItem extends Item { } GunsTool.pvpModeCheck(itemstack, level); - if (tag.getBoolean("draw")) { - tag.putBoolean("draw", false); - tag.putInt("draw_time", 0); + if (itemstack.getOrCreateTag().getBoolean("draw")) { + itemstack.getOrCreateTag().putBoolean("draw", false); + itemstack.getOrCreateTag().putInt("draw_time", 0); entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.zooming = false; capability.syncPlayerVariables(entity); }); if (entity instanceof Player player) { - double weight = tag.getDouble("weight"); + double weight = itemstack.getOrCreateTag().getDouble("weight"); if (weight == 0) { player.getCooldowns().addCooldown(itemstack.getItem(), 12); @@ -73,27 +71,27 @@ public abstract class GunItem extends Item { } } - if (itemstack.getItem() == TargetModItems.RPG.get() && tag.getInt("ammo") == 0) { - tag.putDouble("empty", 1); + if (itemstack.getItem() == TargetModItems.RPG.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) { + itemstack.getOrCreateTag().putDouble("empty", 1); } - if (itemstack.getItem() == TargetModItems.SKS.get() && tag.getInt("ammo") == 0) { - tag.putDouble("HoldOpen", 1); + if (itemstack.getItem() == TargetModItems.SKS.get() && itemstack.getOrCreateTag().getInt("ammo") == 0) { + itemstack.getOrCreateTag().putBoolean("HoldOpen", true); } - if (itemstack.getItem() == TargetModItems.M_60.get() && tag.getInt("ammo") <= 5) { - tag.putDouble("empty", 1); + if (itemstack.getItem() == TargetModItems.M_60.get() && itemstack.getOrCreateTag().getInt("ammo") <= 5) { + itemstack.getOrCreateTag().putBoolean("bullet_chain", true); } } if (mainHandItem.getItem() == itemstack.getItem()) { - if (tag.getInt("draw_time") < 50) { - tag.putInt("draw_time", (tag.getInt("draw_time") + 1)); + if (itemstack.getOrCreateTag().getInt("draw_time") < 50) { + itemstack.getOrCreateTag().putInt("draw_time", (itemstack.getOrCreateTag().getInt("draw_time") + 1)); } } - if (tag.getInt("fire_animation") > 0) { - tag.putInt("fire_animation", (tag.getInt("fire_animation") - 1)); + if (itemstack.getOrCreateTag().getInt("fire_animation") > 0) { + itemstack.getOrCreateTag().putInt("fire_animation", (itemstack.getOrCreateTag().getInt("fire_animation") - 1)); } - if (tag.getDouble("flash_time") > 0) { - tag.putDouble("flash_time", (tag.getDouble("flash_time") - 1)); + if (itemstack.getOrCreateTag().getDouble("flash_time") > 0) { + itemstack.getOrCreateTag().putDouble("flash_time", (itemstack.getOrCreateTag().getDouble("flash_time") - 1)); } } } diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index f50962012..1f30b001d 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -89,11 +89,11 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal")); } @@ -169,65 +169,6 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - - if (entity instanceof Player player) { - double id; - var tag = itemStack.getOrCreateTag(); - id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 61) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.HK_416_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 53) { - entity.getPersistentData().putDouble("id", id); - { - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.HK_416_RELOAD_NORMAL.get(), 100, 1); - } - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE, true); - } - } - } - } - @Override public Set getReloadSound() { return Set.of(TargetModSounds.HK_416_RELOAD_EMPTY.get(), TargetModSounds.HK_416_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index 675348693..0453398bd 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -52,7 +52,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.HUNTING_RIFLE_RELOAD.get()); + return Set.of(TargetModSounds.HUNTING_RIFLE_RELOAD_EMPTY.get()); } @Override @@ -93,7 +93,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.reload")); } @@ -159,44 +159,6 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemstack, world, entity, slot, selected); - - var itemTag = itemstack.getOrCreateTag(); - double id = itemTag.getDouble("id"); - - var mainHandItem = entity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY; - var mainHandItemTag = mainHandItem.getOrCreateTag(); - - if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) { - itemTag.putBoolean("empty_reload", false); - itemTag.putBoolean("reloading", false); - itemTag.putDouble("reload_time", 0); - } - if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") == 0) { - if (itemTag.getDouble("reload_time") == 61) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.HUNTING_RIFLE_RELOAD.get(), 100, 1); - } - } - if (mainHandItem.getItem() == itemstack.getItem() - && mainHandItemTag.getDouble("id") == id) { - if (itemTag.getDouble("reload_time") > 0) { - itemTag.putDouble("reload_time", (itemTag.getDouble("reload_time") - 1)); - } - } else { - itemTag.putBoolean("empty_reload", false); - itemTag.putBoolean("reloading", false); - itemTag.putDouble("reload_time", 0); - } - if (itemTag.getDouble("reload_time") == 1 && mainHandItemTag.getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER); - } - } - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.HUNTING_RIFLE.get()); GunsTool.initCreativeGun(stack, TargetModItems.HUNTING_RIFLE.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/Kraber.java b/src/main/java/net/mcreator/target/item/gun/Kraber.java index 6e1f26957..d849ebffc 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -105,11 +105,11 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.reload")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.reload2")); } @@ -166,62 +166,6 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 83) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.KRABER_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 65) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.KRABER_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER, true); - } - } - } - } - @Override public Multimap getAttributeModifiers(EquipmentSlot slot, ItemStack stack) { Multimap map = super.getAttributeModifiers(slot, stack); diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index a3d69e912..75973ccd4 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -89,11 +89,11 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal")); } @@ -169,62 +169,6 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 61) { - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_4_RELOAD_EMPTY.get(), 100, 1); - } - entity.getPersistentData().putDouble("id", id); - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 53) { - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_4_RELOAD_NORMAL.get(), 100, 1); - } - entity.getPersistentData().putDouble("id", id); - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE, true); - } - } - } - } - @Override public Set getReloadSound() { return Set.of(TargetModSounds.M_4_RELOAD_EMPTY.get(), TargetModSounds.M_4_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/target/item/gun/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index de9ad6754..946cb553d 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -93,11 +93,11 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire2")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload2")); } @@ -151,68 +151,6 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 129) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_60_RELOAD_EMPTY.get(), 100, 1); - } - } - if (tag.getDouble("reload_time") <= 55) { - tag.putDouble("empty", 0); - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 111) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_60_RELOAD_NORMAL.get(), 100, 1); - } - } - if (tag.getDouble("reload_time") <= 55) { - tag.putDouble("empty", 0); - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } - } - } - @Override public Set getReloadSound() { return Set.of(TargetModSounds.M_60_RELOAD_EMPTY.get(), TargetModSounds.M_60_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/target/item/gun/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index 8d9aaac88..a45bf4851 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -51,7 +51,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.M_79_RELOAD.get()); + return Set.of(TargetModSounds.M_79_RELOAD_EMPTY.get()); } public M79Item() { @@ -96,7 +96,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.reload")); } @@ -178,38 +178,6 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { super.inventoryTick(itemStack, world, entity, slot, selected); if (entity instanceof Player player) { itemStack.getOrCreateTag().putInt("max_ammo", getAmmoCount(player)); - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - int ammo1 = 1 - tag.getInt("ammo"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading")) { - if (tag.getDouble("reload_time") == 61) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_79_RELOAD.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - tag.putBoolean("empty_reload", false); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - tag.putInt("ammo", tag.getInt("ammo") + Math.min(ammo1, tag.getInt("max_ammo"))); - player.getInventory().clearOrCountMatchingItems(p -> TargetModItems.GRENADE_40MM.get() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - } - } } } diff --git a/src/main/java/net/mcreator/target/item/gun/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index d2c937928..fffd1c5e1 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -93,11 +93,11 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload_normal")); } @@ -165,62 +165,6 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { return map; } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 83) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_98B_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 61) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_98B_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER, true); - } - } - } - } - @Override public Set getReloadSound() { return Set.of( diff --git a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index 003dbdc2a..fdf1759d6 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -89,11 +89,11 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m14.reload_normal")); } @@ -147,64 +147,6 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 78) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MK_14_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 18 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - tag.putDouble("HoldOpen", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 55) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.MK_14_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE, true); - } - } - } - } - @Override public Set getReloadSound() { return Set.of(TargetModSounds.MK_14_RELOAD_EMPTY.get(), TargetModSounds.MK_14_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index 8dbafbf14..ad29c72f9 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -90,7 +90,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.fire")); } - if (tag.getBoolean("reloading") && tag.getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.reload")); } @@ -171,7 +171,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.RPG_RELOAD.get()); + return Set.of(TargetModSounds.RPG_RELOAD_EMPTY.get()); } @Override @@ -182,45 +182,6 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { var tag = itemStack.getOrCreateTag(); tag.putInt("max_ammo", getAmmoCount(player)); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading")) { - if (tag.getDouble("reload_time") == 97) { - entity.getPersistentData().putDouble("id", id); - if (entity.getServer() != null) { - SoundTool.playLocalSound(player, TargetModSounds.RPG_RELOAD.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - tag.putBoolean("empty_reload", false); - } - if (tag.getDouble("reload_time") == 84) { - tag.putBoolean("empty", false); - } - if (tag.getDouble("reload_time") == 7) { - tag.putBoolean("close_hammer", false); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getInt("max_ammo") >= 0) { - tag.putInt("ammo", 1); - player.getInventory().clearOrCountMatchingItems(p -> TargetModItems.ROCKET.get() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); - - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - } - } - } } } diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index a07e22ab0..fd1b0282e 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -89,11 +89,11 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal")); } @@ -169,63 +169,6 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemstack, world, entity, slot, selected); - - if (entity instanceof Player player) { - var tag = itemstack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 92) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemstack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 70) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemstack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE, true); - } - } - } - - } - @Override public Set getReloadSound() { return Set.of(TargetModSounds.RPK_RELOAD_EMPTY.get(), TargetModSounds.RPK_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index 25d33b63f..2fa31103b 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -116,17 +116,14 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload2")); } -// if (stack.getOrCreateTag().getDouble("charging_time") > 127 && stack.getOrCreateTag().getBoolean("charging")) { -// return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.chargep")); -// } if (stack.getOrCreateTag().getDouble("charging_time") < 127 && stack.getOrCreateTag().getDouble("charging_time") > 0 && stack.getOrCreateTag().getBoolean("charging")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.charge")); @@ -177,100 +174,16 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { @Override public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemStack, world, entity, slot, selected); - if (entity instanceof Player player) { - double cid; - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 73) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.SENTINEL_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 53) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.SENTINEL_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER, true); - } - } - if (tag.getDouble("firing") > 0) { - tag.putDouble("firing", tag.getDouble("firing") - 1); - } - if (tag.getDouble("zoom_firing") > 0) { - tag.putDouble("zoom_firing", tag.getDouble("zoom_firing") - 1); - } + var tag = itemStack.getOrCreateTag(); - cid = tag.getDouble("cid"); - if (player.getMainHandItem().getOrCreateTag().getDouble("cid") != tag.getDouble("cid")) { - tag.putBoolean("charging", false); - tag.putDouble("charging_time", 0); - } - if (tag.getBoolean("charging")) { - if (tag.getDouble("charging_time") == 127) { - entity.getPersistentData().putDouble("cid", cid); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.SENTINEL_CHARGE.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("cid") == cid) { - if (tag.getDouble("charging_time") > 0) { - tag.putDouble("charging_time", tag.getDouble("charging_time") - 1); - } - } else { - tag.putBoolean("charging", false); - tag.putDouble("charging_time", 0); - } - if (tag.getDouble("charging_time") == 16 && player.getMainHandItem().getOrCreateTag().getDouble("cid") == cid) { - tag.putDouble("power", 100); - } - if (tag.getDouble("charging_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("cid") == cid) { - tag.putBoolean("charging", false); - } - } - if (tag.getDouble("power") > 0) { - tag.putDouble("add_damage", 0.2857142857142857 * tag.getDouble("damage") * tag.getDouble("damageadd")); - tag.putDouble("power", tag.getDouble("power") - 0.025); - } else { - tag.putDouble("add_damage", 0); - } - if (tag.getDouble("crot") > 0) { - tag.putDouble("crot", tag.getDouble("crot") - 1); - } + if (tag.getDouble("power") > 0) { + tag.putDouble("add_damage", 0.2857142857142857 * tag.getDouble("damage") * tag.getDouble("damageadd")); + tag.putDouble("power", tag.getDouble("power") - 0.025); + } else { + tag.putDouble("add_damage", 0); + } + if (tag.getDouble("crot") > 0) { + tag.putDouble("crot", tag.getDouble("crot") - 1); } } diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index 63e0ad73c..6dc0ed5a7 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -94,11 +94,11 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload_normal")); } @@ -166,64 +166,6 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 72) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.SKS_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - tag.putBoolean("empty_reload", false); - } - if (tag.getDouble("reload_time") == 14 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - tag.putDouble("HoldOpen", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 51) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.SKS_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", tag.getDouble("reload_time") - 1); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.RIFLE, true); - } - } - } - } - public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.SKS.get()); GunsTool.initCreativeGun(stack, TargetModItems.SKS.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index 945108d8d..913a21c2e 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -89,11 +89,11 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload_normal")); } @@ -140,64 +140,6 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addGunTips(list, stack); } - @Override - public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemStack, world, entity, slot, selected); - if (entity instanceof Player player) { - var tag = itemStack.getOrCreateTag(); - double id = tag.getDouble("id"); - if (player.getMainHandItem().getOrCreateTag().getDouble("id") != tag.getDouble("id")) { - tag.putBoolean("empty_reload", false); - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - } - if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 67) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.SVD_RELOAD_EMPTY.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putDouble("reload_time", 0); - tag.putBoolean("empty_reload", false); - } - if (tag.getDouble("reload_time") == 14 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - tag.putDouble("HoldOpen", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER); - } - } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 53) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.SVD_RELOAD_NORMAL.get(), 100, 1); - } - } - if (player.getMainHandItem().getItem() == itemStack.getItem() - && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - if (tag.getDouble("reload_time") > 0) { - tag.putDouble("reload_time", (tag.getDouble("reload_time") - 1)); - } - } else { - tag.putBoolean("reloading", false); - tag.putBoolean("empty_reload", false); - tag.putDouble("reload_time", 0); - } - if (tag.getDouble("reload_time") == 1 && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.SNIPER, true); - } - } - } - } - @Override public Set getReloadSound() { return Set.of(TargetModSounds.SVD_RELOAD_EMPTY.get(), TargetModSounds.SVD_RELOAD_NORMAL.get()); diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 60720fe51..0b0973057 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -73,7 +73,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.TASER_RELOAD.get()); + return Set.of(TargetModSounds.TASER_RELOAD_EMPTY.get()); } @Override @@ -114,7 +114,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.reload")); } @@ -197,44 +197,6 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { if (entity instanceof Player player) { stack.getOrCreateTag().putInt("max_ammo", getAmmoCount(player)); - - ItemStack heldItem = player.getMainHandItem(); - - double id = stack.getOrCreateTag().getDouble("id"); - if (heldItem.getOrCreateTag().getDouble("id") != stack.getOrCreateTag().getDouble("id")) { - stack.getOrCreateTag().putBoolean("empty_reload", false); - stack.getOrCreateTag().putBoolean("reloading", false); - stack.getOrCreateTag().putDouble("reload_time", 0); - } - - if (stack.getOrCreateTag().getBoolean("reloading")) { - if (stack.getOrCreateTag().getDouble("reload_time") == 54) { - player.getPersistentData().putDouble("id", id); - - if (!player.level().isClientSide()) { - SoundTool.playLocalSound(player, TargetModSounds.TASER_RELOAD.get(), 100, 1); - } - } - if (heldItem.getItem() == stack.getItem() && heldItem.getOrCreateTag().getDouble("id") == id) { - if (stack.getOrCreateTag().getDouble("reload_time") > 0) { - stack.getOrCreateTag().putDouble("reload_time", (stack.getOrCreateTag().getDouble("reload_time") - 1)); - } - } else { - stack.getOrCreateTag().putBoolean("reloading", false); - stack.getOrCreateTag().putDouble("reload_time", 0); - stack.getOrCreateTag().putBoolean("empty_reload", false); - } - - if (stack.getOrCreateTag().getDouble("reload_time") == 1 && heldItem.getOrCreateTag().getDouble("id") == id) { - if (stack.getOrCreateTag().getInt("max_ammo") >= 1) { - stack.getOrCreateTag().putInt("ammo", 1); - - player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.TASER_ELECTRODE.get(), 1, player.inventoryMenu.getCraftSlots()); - stack.getOrCreateTag().putBoolean("reloading", false); - stack.getOrCreateTag().putBoolean("empty_reload", false); - } - } - } } int charge_speed = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.SUPER_RECHARGE.get(), stack); diff --git a/src/main/java/net/mcreator/target/item/gun/Trachelium.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java index 854ae09c3..a386c400c 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -58,7 +58,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { @Override public Set getReloadSound() { - return Set.of(TargetModSounds.TRACHELIUM_RELOAD.get()); + return Set.of(TargetModSounds.TRACHELIUM_RELOAD_EMPTY.get()); } @Override @@ -99,7 +99,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.reload")); } @@ -160,43 +160,6 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { return slotChanged; } - @Override - public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(itemstack, world, entity, slot, selected); - - var itemTag = itemstack.getOrCreateTag(); - double id = itemTag.getDouble("id"); - var mainHandItem = entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY; - var mainHandItemTag = mainHandItem.getOrCreateTag(); - - if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) { - itemTag.putBoolean("empty_reload", false); - itemTag.putBoolean("reloading", false); - itemTag.putDouble("reload_time", 0); - } - if (itemTag.getBoolean("reloading")) { - if (itemTag.getDouble("reload_time") == 62) { - entity.getPersistentData().putDouble("id", id); - if (entity instanceof ServerPlayer serverPlayer) { - SoundTool.playLocalSound(serverPlayer, TargetModSounds.TRACHELIUM_RELOAD.get(), 100, 1); - } - } - if (mainHandItem.getItem() == itemstack.getItem() - && mainHandItemTag.getDouble("id") == id) { - if (itemTag.getDouble("reload_time") > 0) { - itemTag.putDouble("reload_time", (itemTag.getDouble("reload_time") - 1)); - } - } else { - itemTag.putBoolean("reloading", false); - itemTag.putBoolean("empty_reload", false); - itemTag.putDouble("reload_time", 0); - } - if (itemTag.getDouble("reload_time") == 1 && mainHandItemTag.getDouble("id") == id) { - GunsTool.reload(entity, GunInfo.Type.HANDGUN); - } - } - } - @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List list, TooltipFlag flag) { list.add(Component.translatable("des.target.trachelium_1").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC)); diff --git a/src/main/java/net/mcreator/target/item/gun/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/VectorItem.java index c49add6ae..0ff650357 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java @@ -94,11 +94,11 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.fire")); } - if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_empty")); } - if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_normal")); } diff --git a/src/main/java/net/mcreator/target/network/message/FireModeMessage.java b/src/main/java/net/mcreator/target/network/message/FireModeMessage.java index b6565ec03..566e74148 100644 --- a/src/main/java/net/mcreator/target/network/message/FireModeMessage.java +++ b/src/main/java/net/mcreator/target/network/message/FireModeMessage.java @@ -97,15 +97,8 @@ public class FireModeMessage { if (tag.getDouble("burst") == 1) { tag.putInt("fire_mode", 1); setFireMode(player, tag); - return; } } } - - if (item == TargetModItems.SENTINEL.get() && !(player.getCooldowns().isOnCooldown(item)) && !tag.getBoolean("charging") && !tag.getBoolean("reloading")) { - tag.putBoolean("charging", true); - tag.putDouble("cid", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("charging_time", 128); - } } } diff --git a/src/main/java/net/mcreator/target/network/message/ReloadMessage.java b/src/main/java/net/mcreator/target/network/message/ReloadMessage.java index 71f989dac..555b6dafd 100644 --- a/src/main/java/net/mcreator/target/network/message/ReloadMessage.java +++ b/src/main/java/net/mcreator/target/network/message/ReloadMessage.java @@ -71,12 +71,23 @@ public class ReloadMessage { return; } else if (stack.is(TargetModTags.Items.RIFLE) && capability.rifleAmmo == 0) { return; + } else if (stack.getItem() == TargetModItems.TASER.get() && tag.getInt("max_ammo") == 0) { + return; + } else if (stack.getItem() == TargetModItems.M_79.get() && tag.getInt("max_ammo") == 0) { + return; + } else if (stack.getItem() == TargetModItems.RPG.get() && tag.getInt("max_ammo") == 0) { + return; } if (stack.is(TargetModTags.Items.OPEN_BOLT) && can_reload) { - //有OPEN_BOLT的枪非空仓换弹子弹会多一发 - if (tag.getInt("ammo") < tag.getDouble("mag") + 1) { - tag.putBoolean("start_reload",true); + if (stack.getItem() == TargetModItems.M_60.get() || stack.getItem() == TargetModItems.ABEKIRI.get()) { + if (tag.getInt("ammo") < tag.getDouble("mag")) { + tag.putBoolean("start_reload",true); + } + } else { + if (tag.getInt("ammo") < tag.getDouble("mag") + 1) { + tag.putBoolean("start_reload",true); + } } } else if (tag.getInt("ammo") < tag.getDouble("mag")){ tag.putBoolean("start_reload",true); diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index 11a74d914..3ebe178f2 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -18,261 +18,6 @@ public class PlayerReloadProcedure { if (!(entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { CompoundTag tag = player.getMainHandItem().getOrCreateTag(); - if (player.getMainHandItem().getItem() == TargetModItems.TASER.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 1 - && tag.getInt("max_ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 55); - } - if (player.getMainHandItem().getItem() == TargetModItems.TRACHELIUM.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 8 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo > 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 62); - } - if (player.getMainHandItem().getItem() == TargetModItems.HUNTING_RIFLE.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 1 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) { - tag.putBoolean("reloading", true); - tag.putDouble("reload_time", 61); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - } - if (player.getMainHandItem().getItem() == TargetModItems.M_79.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 1 - && tag.getInt("max_ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 61); - } - if (player.getMainHandItem().getItem() == TargetModItems.RPG.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 1 - && tag.getInt("max_ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 97); - } - if (player.getMainHandItem().getItem() == TargetModItems.ABEKIRI.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 2 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo > 0) { - if (tag.getInt("ammo") == 1) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 83); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 99); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.M_98B.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 6 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 61); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 83); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.KRABER.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 5 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 65); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 83); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.VECTOR.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 34 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 43); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 61); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.MK_14.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 21 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 55); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 78); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.SKS.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 21 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 51); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 72); - } - } - if ((player.getMainHandItem().getItem() == TargetModItems.M_4.get() - || player.getMainHandItem().getItem() == TargetModItems.HK_416.get()) - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 31 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 53); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 61); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0 - && tag.getInt("ammo") < 56) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 70); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 92); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.RPK.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0 - && tag.getInt("ammo") < 76) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 70); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 92); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.SENTINEL.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && !tag.getBoolean("charging") - && tag.getInt("ammo") < 6 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 53); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 73); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.SVD.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && tag.getInt("ammo") < 11 - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 53); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 67); - } - } - if (player.getMainHandItem().getItem() == TargetModItems.M_60.get() - && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) - && !tag.getBoolean("reloading") - && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0 - && tag.getInt("ammo") < 100) { - if (tag.getInt("ammo") > 0) { - tag.putBoolean("reloading", true); - tag.putBoolean("empty_reload", false); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 111); - } else if (tag.getInt("ammo") == 0) { - tag.putBoolean("reloading", true); - tag.putDouble("empty_reload", 1); - tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 129); - } - } if (player.getMainHandItem().getItem() == TargetModItems.MARLIN.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && !tag.getBoolean("reloading") diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json index 7374f9686..e6a48ed5f 100644 --- a/src/main/resources/assets/target/sounds.json +++ b/src/main/resources/assets/target/sounds.json @@ -15,7 +15,7 @@ } ] }, - "taser_reload": { + "taser_reload_empty": { "sounds": [ { "name": "target:taser/taser_reload", @@ -56,7 +56,7 @@ } ] }, - "trachelium_reload": { + "trachelium_reload_empty": { "sounds": [ { "name": "target:trachelium/trachelium_reload", @@ -97,7 +97,7 @@ } ] }, - "hunting_rifle_reload": { + "hunting_rifle_reload_empty": { "sounds": [ { "name": "target:hunting_rifle/hunting_rifle_reload", @@ -138,7 +138,7 @@ } ] }, - "m_79_reload": { + "m_79_reload_empty": { "sounds": [ { "name": "target:m_79/m_79_reload", @@ -375,7 +375,7 @@ } ] }, - "rpg_reload": { + "rpg_reload_empty": { "sounds": [ { "name": "target:rpg/rpg_reload", diff --git a/src/main/resources/data/target/guns/abekiri.json b/src/main/resources/data/target/guns/abekiri.json index a0397e4e9..1fd366da4 100644 --- a/src/main/resources/data/target/guns/abekiri.json +++ b/src/main/resources/data/target/guns/abekiri.json @@ -15,5 +15,7 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 83, + "empty_reload_time": 99 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/devotion.json b/src/main/resources/data/target/guns/devotion.json index a2397eeb4..9228dd1e4 100644 --- a/src/main/resources/data/target/guns/devotion.json +++ b/src/main/resources/data/target/guns/devotion.json @@ -16,5 +16,7 @@ "semi": 0, "burst": 0, "auto": 1, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 70, + "empty_reload_time": 92 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/hk_416.json b/src/main/resources/data/target/guns/hk_416.json index dc9992bc4..b493c868f 100644 --- a/src/main/resources/data/target/guns/hk_416.json +++ b/src/main/resources/data/target/guns/hk_416.json @@ -15,5 +15,7 @@ "semi": 1, "burst": 0, "auto": 1, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 53, + "empty_reload_time": 61 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/hunting_rifle.json b/src/main/resources/data/target/guns/hunting_rifle.json index eebbd9ec3..95a22bb35 100644 --- a/src/main/resources/data/target/guns/hunting_rifle.json +++ b/src/main/resources/data/target/guns/hunting_rifle.json @@ -14,5 +14,6 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "empty_reload_time": 61 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/kraber.json b/src/main/resources/data/target/guns/kraber.json index 437902623..4bdaa1f32 100644 --- a/src/main/resources/data/target/guns/kraber.json +++ b/src/main/resources/data/target/guns/kraber.json @@ -19,5 +19,7 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 65, + "empty_reload_time": 83 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/m_4.json b/src/main/resources/data/target/guns/m_4.json index 9d234684e..fe0b0d5ca 100644 --- a/src/main/resources/data/target/guns/m_4.json +++ b/src/main/resources/data/target/guns/m_4.json @@ -15,5 +15,7 @@ "semi": 1, "burst": 0, "auto": 1, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 53, + "empty_reload_time": 61 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/m_60.json b/src/main/resources/data/target/guns/m_60.json index 015317f3f..c4aabcd4b 100644 --- a/src/main/resources/data/target/guns/m_60.json +++ b/src/main/resources/data/target/guns/m_60.json @@ -16,5 +16,7 @@ "semi": 0, "burst": 0, "auto": 1, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 111, + "empty_reload_time": 129 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/m_79.json b/src/main/resources/data/target/guns/m_79.json index a123fe038..6f2e93d5b 100644 --- a/src/main/resources/data/target/guns/m_79.json +++ b/src/main/resources/data/target/guns/m_79.json @@ -12,5 +12,6 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "empty_reload_time": 61 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/m_98b.json b/src/main/resources/data/target/guns/m_98b.json index 5c3343bf9..45e6b617b 100644 --- a/src/main/resources/data/target/guns/m_98b.json +++ b/src/main/resources/data/target/guns/m_98b.json @@ -18,5 +18,7 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 61, + "empty_reload_time": 83 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/mk_14.json b/src/main/resources/data/target/guns/mk_14.json index f94cdd75c..6c8f52309 100644 --- a/src/main/resources/data/target/guns/mk_14.json +++ b/src/main/resources/data/target/guns/mk_14.json @@ -18,5 +18,7 @@ "semi": 1, "burst": 0, "auto": 1, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 55, + "empty_reload_time": 78 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/rpg.json b/src/main/resources/data/target/guns/rpg.json index 22e687d88..0042534d6 100644 --- a/src/main/resources/data/target/guns/rpg.json +++ b/src/main/resources/data/target/guns/rpg.json @@ -12,5 +12,6 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "empty_reload_time": 97 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/rpk.json b/src/main/resources/data/target/guns/rpk.json index 40e99791f..dc798bc21 100644 --- a/src/main/resources/data/target/guns/rpk.json +++ b/src/main/resources/data/target/guns/rpk.json @@ -16,5 +16,7 @@ "semi": 1, "burst": 0, "auto": 1, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 70, + "empty_reload_time": 92 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/sentinel.json b/src/main/resources/data/target/guns/sentinel.json index 991c76384..eab8e1b69 100644 --- a/src/main/resources/data/target/guns/sentinel.json +++ b/src/main/resources/data/target/guns/sentinel.json @@ -16,5 +16,7 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 53, + "empty_reload_time": 73 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/sks.json b/src/main/resources/data/target/guns/sks.json index e3f1b6bdf..4c188d3d2 100644 --- a/src/main/resources/data/target/guns/sks.json +++ b/src/main/resources/data/target/guns/sks.json @@ -15,5 +15,7 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 51, + "empty_reload_time": 72 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/svd.json b/src/main/resources/data/target/guns/svd.json index 43567a8bd..9c86c3122 100644 --- a/src/main/resources/data/target/guns/svd.json +++ b/src/main/resources/data/target/guns/svd.json @@ -15,5 +15,7 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "normal_reload_time": 53, + "empty_reload_time": 67 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/taser.json b/src/main/resources/data/target/guns/taser.json index 50ade3525..13e29ad33 100644 --- a/src/main/resources/data/target/guns/taser.json +++ b/src/main/resources/data/target/guns/taser.json @@ -12,5 +12,6 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "empty_reload_time": 55 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/trachelium.json b/src/main/resources/data/target/guns/trachelium.json index 90eba2dea..d17908713 100644 --- a/src/main/resources/data/target/guns/trachelium.json +++ b/src/main/resources/data/target/guns/trachelium.json @@ -15,5 +15,6 @@ "semi": 1, "burst": 0, "auto": 0, - "burst_size": 1 + "burst_size": 1, + "empty_reload_time": 62 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/vector.json b/src/main/resources/data/target/guns/vector.json index 5fe88f36b..dbcd952a0 100644 --- a/src/main/resources/data/target/guns/vector.json +++ b/src/main/resources/data/target/guns/vector.json @@ -15,5 +15,7 @@ "semi": 1, "burst": 1, "auto": 1, - "burst_size": 3 + "burst_size": 3, + "normal_reload_time": 43, + "empty_reload_time": 61 } \ No newline at end of file diff --git a/src/main/resources/data/target/tags/items/open_bolt.json b/src/main/resources/data/target/tags/items/open_bolt.json index 55bfbd5ff..c6c3e6cc3 100644 --- a/src/main/resources/data/target/tags/items/open_bolt.json +++ b/src/main/resources/data/target/tags/items/open_bolt.json @@ -1,6 +1,8 @@ { "replace": false, "values": [ + "target:abekiri", + "target:m_60", "target:ak_47", "target:svd", "target:mk_14",