From 977523ed6725b7f82a4127fdf2df71e0225d8665 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 10 May 2024 00:44:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=AD=A6=E5=99=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/target/init/TargetModItems.java | 18 +++++++++--------- .../net/mcreator/target/item/gun/AK47Item.java | 2 +- .../net/mcreator/target/item/gun/Aa12Item.java | 2 +- .../mcreator/target/item/gun/Hk416Item.java | 2 +- .../net/mcreator/target/item/gun/M4Item.java | 2 +- .../net/mcreator/target/item/gun/M60Item.java | 2 +- .../net/mcreator/target/item/gun/M79Item.java | 2 +- .../net/mcreator/target/item/gun/M870Item.java | 2 +- .../net/mcreator/target/item/gun/M98bItem.java | 2 +- .../net/mcreator/target/item/gun/Mk14Item.java | 2 +- .../procedures/ChangefiremodeProcedure.java | 4 ++-- ...hairXianShiYouXiNeiDieJiaCengProcedure.java | 2 +- .../procedures/DamageReduceProcedure.java | 2 +- .../target/procedures/M79fireProcedure.java | 2 +- ...79uiXianShiYouXiNeiDieJiaCengProcedure.java | 2 +- .../target/procedures/M870fireProcedure.java | 2 +- .../target/procedures/M98bfireProcedure.java | 2 +- .../target/procedures/NormalMagGunFire.java | 12 ++++++------ .../procedures/PlayerReloadProcedure.java | 18 +++++++++--------- .../procedures/ReloadsoundstopProcedure.java | 2 +- .../procedures/WeapondrawhaveyProcedure.java | 2 +- .../data/target/guns/{aa12.json => aa_12.json} | 0 .../data/target/guns/{ak47.json => ak_47.json} | 0 .../target/guns/{hk416.json => hk_416.json} | 0 .../data/target/guns/{m4.json => m_4.json} | 0 .../data/target/guns/{m60.json => m_60.json} | 0 .../data/target/guns/{m79.json => m_79.json} | 0 .../data/target/guns/{m870.json => m_870.json} | 0 .../data/target/guns/{m98b.json => m_98b.json} | 0 .../data/target/guns/{mk14.json => mk_14.json} | 0 30 files changed, 43 insertions(+), 43 deletions(-) rename src/main/resources/data/target/guns/{aa12.json => aa_12.json} (100%) rename src/main/resources/data/target/guns/{ak47.json => ak_47.json} (100%) rename src/main/resources/data/target/guns/{hk416.json => hk_416.json} (100%) rename src/main/resources/data/target/guns/{m4.json => m_4.json} (100%) rename src/main/resources/data/target/guns/{m60.json => m_60.json} (100%) rename src/main/resources/data/target/guns/{m79.json => m_79.json} (100%) rename src/main/resources/data/target/guns/{m870.json => m_870.json} (100%) rename src/main/resources/data/target/guns/{m98b.json => m_98b.json} (100%) rename src/main/resources/data/target/guns/{mk14.json => mk_14.json} (100%) diff --git a/src/main/java/net/mcreator/target/init/TargetModItems.java b/src/main/java/net/mcreator/target/init/TargetModItems.java index 90c7a3d5e..1070acb85 100644 --- a/src/main/java/net/mcreator/target/init/TargetModItems.java +++ b/src/main/java/net/mcreator/target/init/TargetModItems.java @@ -30,24 +30,24 @@ public class TargetModItems { public static final RegistryObject ABEKIRI = GUNS.register("abekiri", Abekiri::new); public static final RegistryObject TRACHELIUM = GUNS.register("trachelium", Trachelium::new); public static final RegistryObject VECTOR = GUNS.register("vector", VectorItem::new); - public static final RegistryObject AK47 = GUNS.register("ak47", AK47Item::new); + public static final RegistryObject AK_47 = GUNS.register("ak_47", AK47Item::new); public static final RegistryObject SKS = GUNS.register("sks", SksItem::new); - public static final RegistryObject M4 = GUNS.register("m4", M4Item::new); - public static final RegistryObject HK416 = GUNS.register("hk416", Hk416Item::new); - public static final RegistryObject MK14 = GUNS.register("mk14", Mk14Item::new); + public static final RegistryObject M_4 = GUNS.register("m_4", M4Item::new); + public static final RegistryObject HK_416 = GUNS.register("hk_416", Hk416Item::new); + public static final RegistryObject MK_14 = GUNS.register("mk_14", Mk14Item::new); public static final RegistryObject MARLIN = GUNS.register("marlin", MarlinItem::new); public static final RegistryObject SVD = GUNS.register("svd", SvdItem::new); - public static final RegistryObject M98B = GUNS.register("m98b", M98bItem::new); + public static final RegistryObject M_98B = GUNS.register("m_98b", M98bItem::new); public static final RegistryObject SENTINEL = GUNS.register("sentinel", SentinelItem::new); public static final RegistryObject HUNTING_RIFLE = GUNS.register("hunting_rifle", HuntingRifle::new); public static final RegistryObject KRABER = GUNS.register("kraber", Kraber::new); - public static final RegistryObject M870 = GUNS.register("m870", M870Item::new); - public static final RegistryObject AA12 = GUNS.register("aa12", Aa12Item::new); + public static final RegistryObject M_870 = GUNS.register("m_870", M870Item::new); + public static final RegistryObject AA_12 = GUNS.register("aa_12", Aa12Item::new); public static final RegistryObject DEVOTION = GUNS.register("devotion", Devotion::new); public static final RegistryObject RPK = GUNS.register("rpk", RpkItem::new); - public static final RegistryObject M60 = GUNS.register("m60", M60Item::new); + public static final RegistryObject M_60 = GUNS.register("m_60", M60Item::new); public static final RegistryObject MINIGUN = GUNS.register("minigun", Minigun::new); - public static final RegistryObject M79 = GUNS.register("m79", M79Item::new); + public static final RegistryObject M_79 = GUNS.register("m_79", M79Item::new); public static final RegistryObject RPG = GUNS.register("rpg", RpgItem::new); public static final RegistryObject BOCEK = GUNS.register("bocek", BocekItem::new); diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index c0631b4de..6fd164593 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -167,7 +167,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.AK47.get()); + ItemStack stack = new ItemStack(TargetModItems.AK_47.get()); //GunsTool.initGun(stack, TargetModItems.AK_47.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; diff --git a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java index 09e6d011f..3df5cf283 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -173,7 +173,7 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.AA12.get()); + ItemStack stack = new ItemStack(TargetModItems.AA_12.get()); //GunsTool.initGun(stack, TargetModItems.AA_12.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; 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 64531d3c8..6bfa93694 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -167,7 +167,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.HK416.get()); + ItemStack stack = new ItemStack(TargetModItems.HK_416.get()); //GunsTool.initGun(stack, TargetModItems.HK_416.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return 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 d19262409..3e4c14018 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -167,7 +167,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M4.get()); + ItemStack stack = new ItemStack(TargetModItems.M_4.get()); //GunsTool.initGun(stack, TargetModItems.M_4.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; 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 b1bbef16a..fbdf07ac5 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -172,7 +172,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M60.get()); + ItemStack stack = new ItemStack(TargetModItems.M_60.get()); //GunsTool.initGun(stack, TargetModItems.M_60.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; 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 8bf4cd371..b8cbe8873 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -172,7 +172,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M79.get()); + ItemStack stack = new ItemStack(TargetModItems.M_79.get()); //GunsTool.initGun(stack, TargetModItems.M_79.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; diff --git a/src/main/java/net/mcreator/target/item/gun/M870Item.java b/src/main/java/net/mcreator/target/item/gun/M870Item.java index bca7401dc..954cf521c 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -177,7 +177,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M870.get()); + ItemStack stack = new ItemStack(TargetModItems.M_870.get()); //GunsTool.initGun(stack, TargetModItems.M_870.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; 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 f73dd278d..960eee6c1 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -163,7 +163,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.M98B.get()); + ItemStack stack = new ItemStack(TargetModItems.M_98B.get()); //GunsTool.initGun(stack, TargetModItems.M_98B.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; 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 474858938..7e3deb2ed 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -168,7 +168,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { } public static ItemStack getGunInstance() { - ItemStack stack = new ItemStack(TargetModItems.MK14.get()); + ItemStack stack = new ItemStack(TargetModItems.MK_14.get()); //GunsTool.initGun(stack, TargetModItems.MK_14.getId().getPath()); stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag")); return stack; diff --git a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java index a94f51acc..0915d98ea 100644 --- a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java @@ -18,8 +18,8 @@ public class ChangefiremodeProcedure { return; ItemStack usehand = ItemStack.EMPTY; usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (usehand.getItem() == TargetModItems.AK47.get() || usehand.getItem() == TargetModItems.M4.get() || usehand.getItem() == TargetModItems.AA12.get() || usehand.getItem() == TargetModItems.HK416.get() - || usehand.getItem() == TargetModItems.RPK.get() || usehand.getItem() == TargetModItems.MK14.get()) { + if (usehand.getItem() == TargetModItems.AK_47.get() || usehand.getItem() == TargetModItems.M_4.get() || usehand.getItem() == TargetModItems.AA_12.get() || usehand.getItem() == TargetModItems.HK_416.get() + || usehand.getItem() == TargetModItems.RPK.get() || usehand.getItem() == TargetModItems.MK_14.get()) { if (usehand.getOrCreateTag().getDouble("firemode") == 2) { usehand.getOrCreateTag().putDouble("firemode", 0); usehand.getOrCreateTag().putDouble("cg", 10); diff --git a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java index 3665fe038..d5172fcc1 100644 --- a/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/CrosshairXianShiYouXiNeiDieJiaCengProcedure.java @@ -18,7 +18,7 @@ public class CrosshairXianShiYouXiNeiDieJiaCengProcedure { || !(entity.getPersistentData().getDouble("zoom_time") < 7) ) return false; - return !(player.getMainHandItem().getItem() == TargetModItems.M79.get()) + return !(player.getMainHandItem().getItem() == TargetModItems.M_79.get()) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON; } return false; diff --git a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java b/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java index 8b9be5a72..f04aea38d 100644 --- a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java @@ -43,7 +43,7 @@ public class DamageReduceProcedure { } if (damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) { stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M79.get() + if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() || (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get()) { damage = amount; stack.getOrCreateTag().putDouble("damagetotal", (stack.getOrCreateTag().getDouble("damagetotal") + damage)); diff --git a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java index 778ae9e9f..c49c9229f 100644 --- a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java @@ -21,7 +21,7 @@ public class M79fireProcedure { if (entity == null) return; if (entity instanceof Player player && !player.isSpectator()) { ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.M79.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) + if (usehand.getItem() == TargetModItems.M_79.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.recoilhorizon = Math.random() < 0.5 ? -1 : 1; diff --git a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java index 0cc827fad..36aded845 100644 --- a/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79uiXianShiYouXiNeiDieJiaCengProcedure.java @@ -12,7 +12,7 @@ public class M79uiXianShiYouXiNeiDieJiaCengProcedure { if (entity == null) return false; if (entity instanceof Player player) { return !player.isSpectator() - && player.getMainHandItem().getItem() == TargetModItems.M79.get() + && player.getMainHandItem().getItem() == TargetModItems.M_79.get() && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON && !entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()).zooming; } diff --git a/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java index 00587f5d0..0a4c90852 100644 --- a/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java @@ -16,7 +16,7 @@ public class M870fireProcedure { if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("forcestop", 1); } - if (usehand.getItem() == TargetModItems.M870.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem())) + if (usehand.getItem() == TargetModItems.M_870.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { for (int index0 = 0; index0 < 12; index0++) { BulletFireNormalProcedure.execute(entity); diff --git a/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java b/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java index c36170f74..b9fba7daf 100644 --- a/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java @@ -13,7 +13,7 @@ public class M98bfireProcedure { if (entity == null) return; if (entity instanceof Player player && !player.isSpectator()) { ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.M98B.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) + if (usehand.getItem() == TargetModItems.M_98B.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("fireanim", 17); BulletFireNormalProcedure.execute(entity); diff --git a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java index c3660fb49..b27ebe5c7 100644 --- a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java +++ b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java @@ -67,7 +67,7 @@ public class NormalMagGunFire { // for (int index0 = 0; index0 < (int) usehand.getOrCreateTag().getDouble("projectileamount"); index0++) { // BulletFireNormalProcedure.execute(entity); // } - if (usehand.getItem() == TargetModItems.AK47.get()) { + if (usehand.getItem() == TargetModItems.AK_47.get()) { { if (!entity.level().isClientSide() && entity.getServer() != null) { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, @@ -81,7 +81,7 @@ public class NormalMagGunFire { } } } - if (usehand.getItem() == TargetModItems.AA12.get()) { + if (usehand.getItem() == TargetModItems.AA_12.get()) { { if (!entity.level().isClientSide() && entity.getServer() != null) { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, @@ -109,7 +109,7 @@ public class NormalMagGunFire { } } } - if (usehand.getItem() == TargetModItems.HK416.get()) { + if (usehand.getItem() == TargetModItems.HK_416.get()) { { if (!entity.level().isClientSide() && entity.getServer() != null) { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, @@ -123,7 +123,7 @@ public class NormalMagGunFire { } } } - if (usehand.getItem() == TargetModItems.M4.get()) { + if (usehand.getItem() == TargetModItems.M_4.get()) { { if (!entity.level().isClientSide() && entity.getServer() != null) { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, @@ -137,7 +137,7 @@ public class NormalMagGunFire { } } } - if (usehand.getItem() == TargetModItems.M60.get()) { + if (usehand.getItem() == TargetModItems.M_60.get()) { { if (!entity.level().isClientSide() && entity.getServer() != null) { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, @@ -165,7 +165,7 @@ public class NormalMagGunFire { } } } - if (usehand.getItem() == TargetModItems.MK14.get()) { + if (usehand.getItem() == TargetModItems.MK_14.get()) { { if (!entity.level().isClientSide() && entity.getServer() != null) { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index fa6520882..471c24045 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -47,7 +47,7 @@ public class PlayerReloadProcedure { tag.putDouble("emptyreload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); } - if (player.getMainHandItem().getItem() == TargetModItems.M79.get() + if (player.getMainHandItem().getItem() == TargetModItems.M_79.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && tag.getDouble("ammo") < 1 @@ -84,7 +84,7 @@ public class PlayerReloadProcedure { tag.putDouble("reloadtime", 99); } } - if (player.getMainHandItem().getItem() == TargetModItems.M98B.get() + if (player.getMainHandItem().getItem() == TargetModItems.M_98B.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && tag.getDouble("ammo") < 6 @@ -135,7 +135,7 @@ public class PlayerReloadProcedure { tag.putDouble("reloadtime", 61); } } - if (player.getMainHandItem().getItem() == TargetModItems.MK14.get() + if (player.getMainHandItem().getItem() == TargetModItems.MK_14.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && tag.getDouble("ammo") < 21 @@ -169,7 +169,7 @@ public class PlayerReloadProcedure { tag.putDouble("reloadtime", 57); } } - if (player.getMainHandItem().getItem() == TargetModItems.AK47.get() + if (player.getMainHandItem().getItem() == TargetModItems.AK_47.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && tag.getDouble("ammo") < 31 @@ -186,8 +186,8 @@ public class PlayerReloadProcedure { tag.putDouble("reloadtime", 57); } } - if ((player.getMainHandItem().getItem() == TargetModItems.M4.get() - || player.getMainHandItem().getItem() == TargetModItems.HK416.get()) + if ((player.getMainHandItem().getItem() == TargetModItems.M_4.get() + || player.getMainHandItem().getItem() == TargetModItems.HK_416.get()) && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && tag.getDouble("ammo") < 31 @@ -204,7 +204,7 @@ public class PlayerReloadProcedure { tag.putDouble("reloadtime", 55); } } - if (player.getMainHandItem().getItem() == TargetModItems.AA12.get() + if (player.getMainHandItem().getItem() == TargetModItems.AA_12.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && tag.getDouble("ammo") < 26 @@ -289,7 +289,7 @@ public class PlayerReloadProcedure { tag.putDouble("reloadtime", 57); } } - if (player.getMainHandItem().getItem() == TargetModItems.M60.get() + if (player.getMainHandItem().getItem() == TargetModItems.M_60.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0 @@ -320,7 +320,7 @@ public class PlayerReloadProcedure { entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:marlin_start player @s ~ ~ ~ 100 1"); } } - if (player.getMainHandItem().getItem() == TargetModItems.M870.get() + if (player.getMainHandItem().getItem() == TargetModItems.M_870.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 && tag.getDouble("ammo") < 8 diff --git a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java index baed0d3a7..ef6eb8800 100644 --- a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java @@ -164,7 +164,7 @@ public class ReloadsoundstopProcedure { } } } - if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M870.get())) { + if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_870.get())) { { Entity _ent = entity; if (!_ent.level().isClientSide() && _ent.getServer() != null) { diff --git a/src/main/java/net/mcreator/target/procedures/WeapondrawhaveyProcedure.java b/src/main/java/net/mcreator/target/procedures/WeapondrawhaveyProcedure.java index 8b15ea4d6..126b85fc2 100644 --- a/src/main/java/net/mcreator/target/procedures/WeapondrawhaveyProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/WeapondrawhaveyProcedure.java @@ -29,7 +29,7 @@ public class WeapondrawhaveyProcedure { } if (entity instanceof Player _player) _player.getCooldowns().addCooldown(itemstack.getItem(), 32); - if (itemstack.getItem() == TargetModItems.M60.get() && itemstack.getOrCreateTag().getDouble("ammo") <= 5) { + if (itemstack.getItem() == TargetModItems.M_60.get() && itemstack.getOrCreateTag().getDouble("ammo") <= 5) { itemstack.getOrCreateTag().putDouble("empty", 1); } } diff --git a/src/main/resources/data/target/guns/aa12.json b/src/main/resources/data/target/guns/aa_12.json similarity index 100% rename from src/main/resources/data/target/guns/aa12.json rename to src/main/resources/data/target/guns/aa_12.json diff --git a/src/main/resources/data/target/guns/ak47.json b/src/main/resources/data/target/guns/ak_47.json similarity index 100% rename from src/main/resources/data/target/guns/ak47.json rename to src/main/resources/data/target/guns/ak_47.json diff --git a/src/main/resources/data/target/guns/hk416.json b/src/main/resources/data/target/guns/hk_416.json similarity index 100% rename from src/main/resources/data/target/guns/hk416.json rename to src/main/resources/data/target/guns/hk_416.json diff --git a/src/main/resources/data/target/guns/m4.json b/src/main/resources/data/target/guns/m_4.json similarity index 100% rename from src/main/resources/data/target/guns/m4.json rename to src/main/resources/data/target/guns/m_4.json diff --git a/src/main/resources/data/target/guns/m60.json b/src/main/resources/data/target/guns/m_60.json similarity index 100% rename from src/main/resources/data/target/guns/m60.json rename to src/main/resources/data/target/guns/m_60.json diff --git a/src/main/resources/data/target/guns/m79.json b/src/main/resources/data/target/guns/m_79.json similarity index 100% rename from src/main/resources/data/target/guns/m79.json rename to src/main/resources/data/target/guns/m_79.json diff --git a/src/main/resources/data/target/guns/m870.json b/src/main/resources/data/target/guns/m_870.json similarity index 100% rename from src/main/resources/data/target/guns/m870.json rename to src/main/resources/data/target/guns/m_870.json diff --git a/src/main/resources/data/target/guns/m98b.json b/src/main/resources/data/target/guns/m_98b.json similarity index 100% rename from src/main/resources/data/target/guns/m98b.json rename to src/main/resources/data/target/guns/m_98b.json diff --git a/src/main/resources/data/target/guns/mk14.json b/src/main/resources/data/target/guns/mk_14.json similarity index 100% rename from src/main/resources/data/target/guns/mk14.json rename to src/main/resources/data/target/guns/mk_14.json