From 2be6b66229ba88594778060dd2f27b886185ec55 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Wed, 8 May 2024 14:38:52 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E4=BA=86normal=5Fmag=5Fgu?= =?UTF-8?q?n=E7=9A=84tag=EF=BC=8C=E6=AD=A4tag=E5=B0=86=E5=A4=A7=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=BC=B9=E5=8C=A3=E7=B1=BB=E8=87=AA=E5=8A=A8=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E5=85=B1=E7=94=A8=E4=B8=80=E4=B8=AA=E5=BC=80=E7=81=AB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=BE=BF=E4=BA=8E=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E5=B0=84=E9=80=9F=E8=B0=83=E6=95=B4=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=AE=BE=E7=BD=AE=E4=B8=BA600rpm=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86mk14=E5=BC=80=E7=81=AB=E6=97=B6?= =?UTF-8?q?=E6=9E=AA=E6=A0=93=E4=B8=8D=E5=8A=A8=E7=9A=84bug=EF=BC=8C?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=8B=BF=E5=87=BASKS=E4=BC=9A=E5=B4=A9?= =?UTF-8?q?=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/Mk14ItemModel.java | 3 + .../target/procedures/AKfireProcedure.java | 40 --- ...2DsProcedure.java => Aa12DsProcedure.java} | 2 +- .../procedures/Aa12autofireProcedure.java | 99 ------ .../target/procedures/Aa12fireProcedure.java | 19 -- .../procedures/Ak47autofireProcedure.java | 67 ---- .../procedures/BulletFireNormalProcedure.java | 4 +- .../procedures/ChangefiremodeProcedure.java | 2 - .../target/procedures/DevofireProcedure.java | 71 ---- .../procedures/DevotionAutofireProcedure.java | 64 ---- .../procedures/DevotiongfireProcedure.java | 18 -- .../procedures/Hk416autofireProcedure.java | 39 --- .../target/procedures/Hk416fireProcedure.java | 41 --- .../procedures/Hk416firerandomProcedure.java | 52 --- .../target/procedures/HrfireProcedure.java | 30 -- .../procedures/M4autofireProcedure.java | 39 --- .../target/procedures/M4fireProcedure.java | 42 --- .../procedures/M4firerandomProcedure.java | 52 --- .../procedures/M60autofireProcedure.java | 67 ---- .../target/procedures/M60fireProcedure.java | 18 -- .../procedures/Mk14autofireProcedure.java | 53 --- .../target/procedures/Mk14fireProcedure.java | 36 --- .../target/procedures/NormalMagGunFire.java | 303 ++++++++++++++++++ .../target/procedures/PressFireProcedure.java | 34 +- .../procedures/RpkautofireProcedure.java | 69 ---- .../target/procedures/RpkfireProcedure.java | 40 --- .../target/procedures/SksfireProcedure.java | 40 --- .../target/procedures/SvdfireProcedure.java | 40 --- .../procedures/TracheliumfireProcedure.java | 30 -- .../procedures/VecBurstFireProcedure.java | 29 +- .../procedures/VecautofireProcedure.java | 54 ---- .../target/procedures/VecfireProcedure.java | 48 +-- .../assets/target/geo/mk14ebr.geo.json | 9 +- .../resources/data/target/guns/aa_12.json | 3 +- .../resources/data/target/guns/ak_47.json | 3 +- .../resources/data/target/guns/devotion.json | 3 +- .../resources/data/target/guns/hk_416.json | 3 +- .../data/target/guns/hunting_rifle.json | 3 +- src/main/resources/data/target/guns/m_4.json | 3 +- src/main/resources/data/target/guns/m_60.json | 3 +- .../resources/data/target/guns/mk_14.json | 3 +- src/main/resources/data/target/guns/rpk.json | 3 +- src/main/resources/data/target/guns/sks.json | 3 +- src/main/resources/data/target/guns/svd.json | 3 +- .../data/target/guns/trachelium.json | 3 +- .../resources/data/target/guns/vector.json | 3 +- .../target/tags/items/normal_mag_gun.json | 18 ++ 47 files changed, 412 insertions(+), 1199 deletions(-) delete mode 100644 src/main/java/net/mcreator/target/procedures/AKfireProcedure.java rename src/main/java/net/mcreator/target/procedures/{As12DsProcedure.java => Aa12DsProcedure.java} (98%) delete mode 100644 src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/DevofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Hk416autofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Hk416fireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/HrfireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/M4autofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/M4fireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/M60fireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java create mode 100644 src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java delete mode 100644 src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/RpkfireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/SksfireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/SvdfireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java create mode 100644 src/main/resources/data/target/tags/items/normal_mag_gun.json 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 7f445755e..396d402c5 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 @@ -35,6 +35,7 @@ public class Mk14ItemModel extends GeoModel { CoreGeoBone l = getAnimationProcessor().getBone("l"); CoreGeoBone r = getAnimationProcessor().getBone("r"); CoreGeoBone body = getAnimationProcessor().getBone("mk14_default"); + CoreGeoBone shuan = getAnimationProcessor().getBone("shuan"); Player player = Minecraft.getInstance().player; ItemStack stack = player.getMainHandItem(); @@ -69,6 +70,8 @@ public class Mk14ItemModel extends GeoModel { shen.setPosZ(3f * (float) fp); + shuan.setPosZ(6f * (float) fp); + if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { shen.setRotX(0.001f * (float) fp); } else { diff --git a/src/main/java/net/mcreator/target/procedures/AKfireProcedure.java b/src/main/java/net/mcreator/target/procedures/AKfireProcedure.java deleted file mode 100644 index 74ebb418e..000000000 --- a/src/main/java/net/mcreator/target/procedures/AKfireProcedure.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class AKfireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.AK_47.get()) { - if (usehand.getOrCreateTag().getDouble("firemode") == 0) { - if (usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { - player.getCooldowns().addCooldown(usehand.getItem(), 2); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:ak47_fire_3p"); - } - BulletFireNormalProcedure.execute(entity); - AkDsProcedure.execute(entity); - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } else if (usehand.getOrCreateTag().getDouble("firemode") == 2) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/As12DsProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12DsProcedure.java similarity index 98% rename from src/main/java/net/mcreator/target/procedures/As12DsProcedure.java rename to src/main/java/net/mcreator/target/procedures/Aa12DsProcedure.java index 3a01872d4..cc2c0cab6 100644 --- a/src/main/java/net/mcreator/target/procedures/As12DsProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Aa12DsProcedure.java @@ -6,7 +6,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; -public class As12DsProcedure { +public class Aa12DsProcedure { public static void execute(Entity entity) { if (entity == null) return; diff --git a/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java deleted file mode 100644 index 02b1e39ee..000000000 --- a/src/main/java/net/mcreator/target/procedures/Aa12autofireProcedure.java +++ /dev/null @@ -1,99 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class Aa12autofireProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1 && usehand.getOrCreateTag().getDouble("firemode") == 2) { - if (usehand.getItem() == TargetModItems.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { - for (int index0 = 0; index0 < 8; index0++) { - BulletFireNormalProcedure.execute(entity); - } - As12DsProcedure.execute(entity); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 4); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_fire_1p player @s ~ ~ ~ 2 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12fire player @a ~ ~ ~ 6 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:aa12fire"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } else if (entity.getPersistentData().getDouble("firing") == 1 && usehand.getOrCreateTag().getDouble("firemode") == 0) { - entity.getPersistentData().putDouble("firing", 0); - if (usehand.getItem() == TargetModItems.AA_12.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck20 && _plrCldCheck20.getCooldowns().isOnCooldown(usehand.getItem()))) { - for (int index1 = 0; index1 < 8; index1++) { - BulletFireNormalProcedure.execute(entity); - } - As12DsProcedure.execute(entity); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 4); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_fire_1p player @s ~ ~ ~ 2 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12fire player @a ~ ~ ~ 6 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:aa12fire"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java deleted file mode 100644 index fd227bec1..000000000 --- a/src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class Aa12fireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - ItemStack usehand; - if (entity instanceof Player player && !player.isSpectator()) { - usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.AA_12.get()) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java deleted file mode 100644 index 737d2cae0..000000000 --- a/src/main/java/net/mcreator/target/procedures/Ak47autofireProcedure.java +++ /dev/null @@ -1,67 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class Ak47autofireProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.AK_47.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { - usehand.getOrCreateTag().putDouble("firecooldown", 7); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 2); - BulletFireNormalProcedure.execute(entity); - AkDsProcedure.execute(entity); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_fire_1p player @s ~ ~ ~ 2 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_fire_3p player @a ~ ~ ~ 4 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:ak47_fire_3p"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java index 242a10e47..ff05585cb 100644 --- a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java @@ -37,7 +37,7 @@ public class BulletFireNormalProcedure { if (!entity.level().isClientSide() && entity instanceof LivingEntity living) { float damage; float headshot = (float) heldItem.getOrCreateTag().getDouble("headshot"); - float velocity = 4 * (float) heldItem.getOrCreateTag().getDouble("power"); + float velocity = 4 * (float) heldItem.getOrCreateTag().getDouble("speed"); if (heldItem.getItem() == TargetModItems.BOCEK.get()) { @@ -46,7 +46,7 @@ public class BulletFireNormalProcedure { ProjectileEntity projectile = new ProjectileEntity(entity.level(), living, damage, headshot); projectile.setPos((living.getX() + (-0.5) * living.getLookAngle().x), (living.getEyeY() - 0.1 + (-0.5) * living.getLookAngle().y), (living.getZ() + (-0.5) * living.getLookAngle().z)); - projectile.shoot(living.getLookAngle().x, living.getLookAngle().y, living.getLookAngle().z,3 * (float) heldItem.getOrCreateTag().getDouble("speed"), 2.5f); + projectile.shoot(living.getLookAngle().x, living.getLookAngle().y, living.getLookAngle().z,3 * velocity, 2.5f); entity.level().addFreshEntity(projectile); } else { diff --git a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java index fc64eec67..0915d98ea 100644 --- a/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ChangefiremodeProcedure.java @@ -23,7 +23,6 @@ public class ChangefiremodeProcedure { if (usehand.getOrCreateTag().getDouble("firemode") == 2) { usehand.getOrCreateTag().putDouble("firemode", 0); usehand.getOrCreateTag().putDouble("cg", 10); - entity.getPersistentData().putDouble("firing", 0); { 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, @@ -49,7 +48,6 @@ public class ChangefiremodeProcedure { if (usehand.getOrCreateTag().getDouble("firemode") == 0) { usehand.getOrCreateTag().putDouble("firemode", 1); usehand.getOrCreateTag().putDouble("cg", 10); - entity.getPersistentData().putDouble("firing", 0); { 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/DevofireProcedure.java b/src/main/java/net/mcreator/target/procedures/DevofireProcedure.java deleted file mode 100644 index 3a829e984..000000000 --- a/src/main/java/net/mcreator/target/procedures/DevofireProcedure.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.network.TargetModVariables; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; - -public class DevofireProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (Math.random() < 0.5) { - { - double _setval = -1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.recoilhorizon = _setval; - capability.syncPlayerVariables(entity); - }); - } - } else { - { - double _setval = 1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.recoilhorizon = _setval; - capability.syncPlayerVariables(entity); - }); - } - } - { - double _setval = 0.1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.recoil = _setval; - capability.syncPlayerVariables(entity); - }); - } - { - double _setval = 1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.firing = _setval; - capability.syncPlayerVariables(entity); - }); - } - BulletFireNormalProcedure.execute(entity); - ArDsProcedure.execute(entity); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_fire_1p player @s ~ ~ ~ 2 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_fire_3p player @a ~ ~ ~ 4 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:devotion_fire_3p"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } -} diff --git a/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java b/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java deleted file mode 100644 index fb079a220..000000000 --- a/src/main/java/net/mcreator/target/procedures/DevotionAutofireProcedure.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class DevotionAutofireProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - entity.getPersistentData().putDouble("dvfire", (entity.getPersistentData().getDouble("dvfire") + 1)); - } else { - if (entity.getPersistentData().getDouble("dvfire") > 0) { - entity.getPersistentData().putDouble("dvfire", (entity.getPersistentData().getDouble("dvfire") - 1)); - } - } - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 1) { - DevofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 5) { - DevofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 9) { - DevofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 12) { - DevofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("dvfire") == 15) { - DevofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.DEVOTION.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && (entity.getPersistentData().getDouble("dvfire") == 17 || entity.getPersistentData().getDouble("dvfire") == 18 || entity.getPersistentData().getDouble("dvfire") == 19)) { - DevofireProcedure.execute(entity); - } - if (entity.getPersistentData().getDouble("dvfire") >= 19) { - entity.getPersistentData().putDouble("dvfire", 15); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java b/src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java deleted file mode 100644 index d0d4612ef..000000000 --- a/src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class DevotiongfireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.DEVOTION.get()) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Hk416autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416autofireProcedure.java deleted file mode 100644 index 68ce43a04..000000000 --- a/src/main/java/net/mcreator/target/procedures/Hk416autofireProcedure.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; - -public class Hk416autofireProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - BulletFireNormalProcedure.execute(entity); - HkDsProcedure.execute(entity); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_fire1p player @s ~ ~ ~ 2 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416fire player @a ~ ~ ~ 4 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416fire"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Hk416fireProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416fireProcedure.java deleted file mode 100644 index 8e9a4179a..000000000 --- a/src/main/java/net/mcreator/target/procedures/Hk416fireProcedure.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class Hk416fireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.HK_416.get()) { - if (usehand.getOrCreateTag().getDouble("firemode") == 0) { - if (usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 2); - BulletFireNormalProcedure.execute(entity); - HkDsProcedure.execute(entity); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_fire1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416fire player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416fire"); - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } else if (usehand.getOrCreateTag().getDouble("firemode") == 2) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java deleted file mode 100644 index 6e4c56a60..000000000 --- a/src/main/java/net/mcreator/target/procedures/Hk416firerandomProcedure.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class Hk416firerandomProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - entity.getPersistentData().putDouble("hkfire", (entity.getPersistentData().getDouble("hkfire") + 1)); - } else { - entity.getPersistentData().putDouble("hkfire", 0); - } - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 1) { - Hk416autofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 3) { - Hk416autofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.HK_416.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("hkfire") == 5) { - Hk416autofireProcedure.execute(entity); - } - if (entity.getPersistentData().getDouble("hkfire") >= 5) { - entity.getPersistentData().putDouble("hkfire", 0); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/HrfireProcedure.java b/src/main/java/net/mcreator/target/procedures/HrfireProcedure.java deleted file mode 100644 index 21a33d510..000000000 --- a/src/main/java/net/mcreator/target/procedures/HrfireProcedure.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class HrfireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.HUNTING_RIFLE.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) - && usehand.getOrCreateTag().getDouble("ammo") > 0) { - BulletFireNormalProcedure.execute(entity); - player.getCooldowns().addCooldown(usehand.getItem(), 13); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hr_fire_1p player @a ~ ~ ~ 4 1"); - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/M4autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/M4autofireProcedure.java deleted file mode 100644 index b70e4db53..000000000 --- a/src/main/java/net/mcreator/target/procedures/M4autofireProcedure.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; - -public class M4autofireProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - BulletFireNormalProcedure.execute(entity); - ArDsProcedure.execute(entity); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4fire player @s ~ ~ ~ 2 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4fire_3p player @a ~ ~ ~ 4 1"); - } - } - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4fire_3p"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } -} diff --git a/src/main/java/net/mcreator/target/procedures/M4fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M4fireProcedure.java deleted file mode 100644 index 76c5cf03f..000000000 --- a/src/main/java/net/mcreator/target/procedures/M4fireProcedure.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class M4fireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - ItemStack weaponzoom = ItemStack.EMPTY; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.M_4.get()) { - if (usehand.getOrCreateTag().getDouble("firemode") == 0) { - if (usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 2); - BulletFireNormalProcedure.execute(entity); - ArDsProcedure.execute(entity); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4fire player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4fire_3p"); - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } else if (usehand.getOrCreateTag().getDouble("firemode") == 2) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java b/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java deleted file mode 100644 index d2891bbcd..000000000 --- a/src/main/java/net/mcreator/target/procedures/M4firerandomProcedure.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class M4firerandomProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - entity.getPersistentData().putDouble("m4fire", (entity.getPersistentData().getDouble("m4fire") + 1)); - } else { - entity.getPersistentData().putDouble("m4fire", 0); - } - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 1) { - M4autofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 3) { - M4autofireProcedure.execute(entity); - } - if (usehand.getItem() == TargetModItems.M_4.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && entity.getPersistentData().getDouble("m4fire") == 5) { - M4autofireProcedure.execute(entity); - } - if (entity.getPersistentData().getDouble("m4fire") >= 5) { - entity.getPersistentData().putDouble("m4fire", 0); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java deleted file mode 100644 index a65db0b81..000000000 --- a/src/main/java/net/mcreator/target/procedures/M60autofireProcedure.java +++ /dev/null @@ -1,67 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.mcreator.target.network.TargetModVariables; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class M60autofireProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.M_60.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { - if (usehand.getOrCreateTag().getDouble("animindex") == 1) { - usehand.getOrCreateTag().putDouble("animindex", 0); - } else { - usehand.getOrCreateTag().putDouble("animindex", 1); - } - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 2); - BulletFireNormalProcedure.execute(entity); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m60fire player @a ~ ~ ~ 4 1"); - } - } - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - usehand.getOrCreateTag().putDouble("empty", 1); - usehand.getOrCreateTag().putDouble("fireanim", 2); - { - double _setval = 1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.firing = _setval; - capability.syncPlayerVariables(entity); - }); - } - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/M60fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M60fireProcedure.java deleted file mode 100644 index 3dab4033f..000000000 --- a/src/main/java/net/mcreator/target/procedures/M60fireProcedure.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class M60fireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.M_60.get()) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java b/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java deleted file mode 100644 index 82ca2cba5..000000000 --- a/src/main/java/net/mcreator/target/procedures/Mk14autofireProcedure.java +++ /dev/null @@ -1,53 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class Mk14autofireProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.MK_14.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 2); - BulletFireNormalProcedure.execute(entity); - { - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:mk14fire player @a ~ ~ ~ 4 1"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java b/src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java deleted file mode 100644 index ef3c16bd4..000000000 --- a/src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class Mk14fireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.MK_14.get()) { - if (usehand.getOrCreateTag().getDouble("firemode") == 0) { - if (usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { - BulletFireNormalProcedure.execute(entity); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 2); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:mk14fire player @a ~ ~ ~ 4 1"); - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } else if (usehand.getOrCreateTag().getDouble("firemode") == 2) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java new file mode 100644 index 000000000..20e7f476f --- /dev/null +++ b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java @@ -0,0 +1,303 @@ +package net.mcreator.target.procedures; + +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.event.TickEvent; + +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.tags.ItemTags; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.CommandSource; + +import net.mcreator.target.init.TargetModItems; + +import javax.annotation.Nullable; + +@Mod.EventBusSubscriber +public class NormalMagGunFire { + @SubscribeEvent + public static void onPlayerTick(TickEvent.PlayerTickEvent event) { + if (event.phase == TickEvent.Phase.END) { + execute(event, event.player); + } + } + + public static void execute(Entity entity) { + execute(null, entity); + } + + private static void execute(@Nullable Event event, Entity entity) { + if (entity == null) + return; + ItemStack usehand = ItemStack.EMPTY; + double dam = 0; + usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); + if (usehand.is(ItemTags.create(new ResourceLocation("target:normal_mag_gun"))) && entity.getPersistentData().getDouble("firing") == 1 && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 + && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { + if (usehand.getOrCreateTag().getDouble("firemode") == 0) { + entity.getPersistentData().putDouble("firing", 0); + } + if (usehand.getOrCreateTag().getDouble("animindex") == 1) { + usehand.getOrCreateTag().putDouble("animindex", 0); + } else { + usehand.getOrCreateTag().putDouble("animindex", 1); + } + if (usehand.getOrCreateTag().getDouble("ammo") == 1) { + usehand.getOrCreateTag().putDouble("gj", 1); + } + usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); + usehand.getOrCreateTag().putDouble("firecooldown", 7); + usehand.getOrCreateTag().putDouble("fireanim", 2); + usehand.getOrCreateTag().putDouble("empty", 1); + if (entity instanceof Player _player) + _player.getCooldowns().addCooldown(usehand.getItem(), 2); + for (int index0 = 0; index0 < (int) usehand.getOrCreateTag().getDouble("projectileamount"); index0++) { + BulletFireNormalProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.AK_47.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:ak47_fire_1p player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:ak47_fire_3p player @a ~ ~ ~ 4 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:ak47_fire_3p"); + } + } + // 这个是远处的枪声 + AkDsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.AA_12.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:aa12_fire_1p player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:aa12fire player @a ~ ~ ~ 6 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:aa12fire"); + } + } + Aa12DsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.DEVOTION.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:devotion_fire_1p player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:devotion_fire_3p player @a ~ ~ ~ 4 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:devotion_fire_3p"); + } + } + ArDsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.HK_416.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:hk416_fire1p player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:hk416fire player @a ~ ~ ~ 4 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:hk416fire"); + } + } + HkDsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.M_4.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:m4fire player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:m4fire_3p player @a ~ ~ ~ 4 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:m4fire_3p"); + } + } + ArDsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.M_60.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:m60fire player @a ~ ~ ~ 4 1"); + } + } + } + if (usehand.getItem() == TargetModItems.SKS.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:ak_fire_1p player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:ak_fire_3p player @a ~ ~ ~ 5 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:ak_fire_3p"); + } + } + SksDsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.MK_14.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:mk14fire player @a ~ ~ ~ 4 1"); + } + } + } + if (usehand.getItem() == TargetModItems.RPK.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpk_fire1p player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpkfire player @a ~ ~ ~ 4 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:rpkfire"); + } + } + AkDsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.SVD.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:svdfire1p player @s ~ ~ ~ 2 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:svdfire3p player @a ~ ~ ~ 6 1"); + } + } + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:svdfire3p"); + } + } + SvdDsProcedure.execute(entity); + } + if (usehand.getItem() == TargetModItems.VECTOR.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:vec3 player @a ~ ~ ~ 2 1"); + } + } + } + if (usehand.getItem() == TargetModItems.TRACHELIUM.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:trachelium3p player @a ~ ~ ~ 4 1"); + } + } + } + if (usehand.getItem() == TargetModItems.HUNTING_RIFLE.get()) { + { + Entity _ent = entity; + if (!_ent.level().isClientSide() && _ent.getServer() != null) { + _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:hr_fire_1p player @a ~ ~ ~ 4 1"); + } + } + } + } + } +} diff --git a/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java b/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java index 4e019e333..5e2109918 100644 --- a/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PressFireProcedure.java @@ -1,43 +1,33 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; -import net.mcreator.target.network.TargetModVariables; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.tags.ItemTags; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.CommandSource; + +import net.mcreator.target.network.TargetModVariables; +import net.mcreator.target.init.TargetModItems; public class PressFireProcedure { public static void execute(Entity entity) { if (entity == null) return; - TracheliumfireProcedure.execute(entity); TaserfireProcedure.execute(entity); - HrfireProcedure.execute(entity); M79fireProcedure.execute(entity); AbkrfireProcedure.execute(entity); M98bfireProcedure.execute(entity); - DevotiongfireProcedure.execute(entity); RpgfireProcedure.execute(entity); - M4fireProcedure.execute(entity); - Aa12fireProcedure.execute(entity); - Hk416fireProcedure.execute(entity); - RpkfireProcedure.execute(entity); - SksfireProcedure.execute(entity); KraberfireProcedure.execute(entity); - VecfireProcedure.execute(entity); MinigunfireProcedure.execute(entity); - Mk14fireProcedure.execute(entity); SentinelFireProcedure.execute(entity); - M60fireProcedure.execute(entity); - SvdfireProcedure.execute(entity); MarlinfireProcedure.execute(entity); M870fireProcedure.execute(entity); - AKfireProcedure.execute(entity); + VecfireProcedure.execute(entity); + entity.getPersistentData().putDouble("firing", 1); if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun"))) && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get()) && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get()) diff --git a/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java deleted file mode 100644 index a37d1d4c2..000000000 --- a/src/main/java/net/mcreator/target/procedures/RpkautofireProcedure.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class RpkautofireProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.RPK.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 2); - BulletFireNormalProcedure.execute(entity); - AkDsProcedure.execute(entity); - { - Entity _ent = entity; - if (!_ent.level().isClientSide() && _ent.getServer() != null) { - _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, - _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpk_fire1p player @s ~ ~ ~ 2 1"); - } - } - { - Entity _ent = entity; - if (!_ent.level().isClientSide() && _ent.getServer() != null) { - _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, - _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpkfire player @a ~ ~ ~ 4 1"); - } - } - { - Entity _ent = entity; - if (!_ent.level().isClientSide() && _ent.getServer() != null) { - _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, - _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:rpkfire"); - } - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/RpkfireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpkfireProcedure.java deleted file mode 100644 index 2d444a4bf..000000000 --- a/src/main/java/net/mcreator/target/procedures/RpkfireProcedure.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class RpkfireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() != TargetModItems.RPK.get()) return; - if (usehand.getOrCreateTag().getDouble("firemode") == 0) { - if (usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { - player.getCooldowns().addCooldown(usehand.getItem(), 2); - BulletFireNormalProcedure.execute(entity); - AkDsProcedure.execute(entity); - - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - - if (!entity.level().isClientSide() && entity.getServer() == null) return; - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:rpk_fire1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:rpkfire player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:rpkfire"); - } - } else if (usehand.getOrCreateTag().getDouble("firemode") == 2) { - entity.getPersistentData().putDouble("firing", 1); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/SksfireProcedure.java b/src/main/java/net/mcreator/target/procedures/SksfireProcedure.java deleted file mode 100644 index 176b8dde5..000000000 --- a/src/main/java/net/mcreator/target/procedures/SksfireProcedure.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class SksfireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.SKS.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) - && usehand.getOrCreateTag().getDouble("ammo") > 0) { - BulletFireNormalProcedure.execute(entity); - SksDsProcedure.execute(entity); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak_fire_3p player @a ~ ~ ~ 5 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:ak_fire_3p"); - } - if (usehand.getOrCreateTag().getDouble("ammo") == 1) { - player.getCooldowns().addCooldown(usehand.getItem(), 10); - usehand.getOrCreateTag().putDouble("gj", 1); - } else { - player.getCooldowns().addCooldown(usehand.getItem(), 3); - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/SvdfireProcedure.java b/src/main/java/net/mcreator/target/procedures/SvdfireProcedure.java deleted file mode 100644 index c7c944c98..000000000 --- a/src/main/java/net/mcreator/target/procedures/SvdfireProcedure.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class SvdfireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.SVD.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) - && usehand.getOrCreateTag().getDouble("ammo") > 0) { - BulletFireNormalProcedure.execute(entity); - SvdDsProcedure.execute(entity); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:svdfire1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:svdfire3p player @a ~ ~ ~ 6 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:svdfire3p"); - } - if (usehand.getOrCreateTag().getDouble("ammo") == 1) { - player.getCooldowns().addCooldown(usehand.getItem(), 10); - usehand.getOrCreateTag().putDouble("gj", 1); - } else { - player.getCooldowns().addCooldown(usehand.getItem(), 5); - } - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - usehand.getOrCreateTag().putDouble("fireanim", 2); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java b/src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java deleted file mode 100644 index 43901140b..000000000 --- a/src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class TracheliumfireProcedure { - public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); - if (usehand.getItem() == TargetModItems.TRACHELIUM.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) - && usehand.getOrCreateTag().getDouble("ammo") > 0) { - BulletFireNormalProcedure.execute(entity); - player.getCooldowns().addCooldown(usehand.getItem(), 4); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium3p player @a ~ ~ ~ 4 1"); - } - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java index aded68773..c47a80f86 100644 --- a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java @@ -1,19 +1,21 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.event.TickEvent; + +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.tags.ItemTags; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.CommandSource; + +import net.mcreator.target.init.TargetModItems; import javax.annotation.Nullable; @@ -66,3 +68,4 @@ public class VecBurstFireProcedure { } } } + diff --git a/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java deleted file mode 100644 index 25f5e8fcf..000000000 --- a/src/main/java/net/mcreator/target/procedures/VecautofireProcedure.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class VecautofireProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (entity.getPersistentData().getDouble("firing") == 1) { - if (usehand.getItem() == TargetModItems.VECTOR.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck5 && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem()))) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 1); - BulletFireNormalProcedure.execute(entity); - { - Entity _ent = entity; - if (!_ent.level().isClientSide() && _ent.getServer() != null) { - _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, - _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:vec3 player @a ~ ~ ~ 2 1"); - } - } - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - usehand.getOrCreateTag().putDouble("fireanim", 2); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/VecfireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecfireProcedure.java index b7772125e..3ae3683d4 100644 --- a/src/main/java/net/mcreator/target/procedures/VecfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecfireProcedure.java @@ -1,37 +1,37 @@ package net.mcreator.target.procedures; -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.GameType; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.client.Minecraft; + +import net.mcreator.target.init.TargetModItems; public class VecfireProcedure { public static void execute(Entity entity) { - if (entity == null) return; - if (entity instanceof Player player && !player.isSpectator()) { - ItemStack usehand = player.getMainHandItem(); + if (entity == null) + return; + ItemStack usehand = ItemStack.EMPTY; + if (!(new Object() { + public boolean checkGamemode(Entity _ent) { + if (_ent instanceof ServerPlayer _serverPlayer) { + return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.SPECTATOR; + } else if (_ent.level().isClientSide() && _ent instanceof Player _player) { + return Minecraft.getInstance().getConnection().getPlayerInfo(_player.getGameProfile().getId()) != null && Minecraft.getInstance().getConnection().getPlayerInfo(_player.getGameProfile().getId()).getGameMode() == GameType.SPECTATOR; + } + return false; + } + }.checkGamemode(entity))) { + usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); if (usehand.getItem() == TargetModItems.VECTOR.get()) { - if (usehand.getOrCreateTag().getDouble("firemode") == 0) { - if (usehand.getOrCreateTag().getDouble("reloading") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0 && !(entity instanceof Player _plrCldCheck6 && _plrCldCheck6.getCooldowns().isOnCooldown(usehand.getItem()))) { - player.getCooldowns().addCooldown(usehand.getItem(), 1); - BulletFireNormalProcedure.execute(entity); - - 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, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:vec3 player @a ~ ~ ~ 2 1"); - } - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - usehand.getOrCreateTag().putDouble("fireanim", 2); - } - } else if (usehand.getOrCreateTag().getDouble("firemode") == 1 && usehand.getOrCreateTag().getDouble("burst") == 0) { + if (usehand.getOrCreateTag().getDouble("firemode") == 1 && usehand.getOrCreateTag().getDouble("burst") == 0) { usehand.getOrCreateTag().putDouble("burst", 3); - } else if (usehand.getOrCreateTag().getDouble("firemode") == 2) { - entity.getPersistentData().putDouble("firing", 1); } } } } } + diff --git a/src/main/resources/assets/target/geo/mk14ebr.geo.json b/src/main/resources/assets/target/geo/mk14ebr.geo.json index 55a374135..c9a223147 100644 --- a/src/main/resources/assets/target/geo/mk14ebr.geo.json +++ b/src/main/resources/assets/target/geo/mk14ebr.geo.json @@ -9408,8 +9408,13 @@ "pivot": [0, 7.63984, -23.7] }, { - "name": "action", + "name": "shuan", "parent": "bolt", + "pivot": [0, 7.63984, -23.7] + }, + { + "name": "action", + "parent": "shuan", "pivot": [0, 7.63984, -23.7], "cubes": [ { @@ -9546,7 +9551,7 @@ }, { "name": "action2", - "parent": "bolt", + "parent": "shuan", "pivot": [-0.00553, 5.73422, -16.03211], "cubes": [ { diff --git a/src/main/resources/data/target/guns/aa_12.json b/src/main/resources/data/target/guns/aa_12.json index 6b1399a16..7116b7c67 100644 --- a/src/main/resources/data/target/guns/aa_12.json +++ b/src/main/resources/data/target/guns/aa_12.json @@ -9,5 +9,6 @@ "damage": 1.5, "headshot": 1.5, "velocity": 16, - "mag": 25 + "mag": 25, + "projectileamount": 8 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/ak_47.json b/src/main/resources/data/target/guns/ak_47.json index f2745f1cf..4f9935863 100644 --- a/src/main/resources/data/target/guns/ak_47.json +++ b/src/main/resources/data/target/guns/ak_47.json @@ -9,5 +9,6 @@ "damage": 8.5, "headshot": 1.75, "velocity": 30, - "mag": 30 + "mag": 30, + "projectileamount": 1 } \ 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 1eb42eeb1..1b50127e5 100644 --- a/src/main/resources/data/target/guns/devotion.json +++ b/src/main/resources/data/target/guns/devotion.json @@ -12,5 +12,6 @@ "headshot": 2, "velocity": 40, "mag": 55, - "firemode": 2 + "firemode": 2, + "projectileamount": 1 } \ 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 7049bebe7..7a603b835 100644 --- a/src/main/resources/data/target/guns/hk_416.json +++ b/src/main/resources/data/target/guns/hk_416.json @@ -9,5 +9,6 @@ "damage": 7.5, "headshot": 2, "velocity": 45, - "mag": 30 + "mag": 30, + "projectileamount": 1 } \ 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 4f700196e..00a8f7915 100644 --- a/src/main/resources/data/target/guns/hunting_rifle.json +++ b/src/main/resources/data/target/guns/hunting_rifle.json @@ -8,5 +8,6 @@ "damage": 40, "headshot": 3, "velocity": 50, - "mag": 1 + "mag": 1, + "projectileamount": 1 } \ 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 ec36a2359..aee932735 100644 --- a/src/main/resources/data/target/guns/m_4.json +++ b/src/main/resources/data/target/guns/m_4.json @@ -9,5 +9,6 @@ "damage": 7, "headshot": 2, "velocity": 45, - "mag": 30 + "mag": 30, + "projectileamount": 1 } \ 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 3e36376d3..f2ed6b9af 100644 --- a/src/main/resources/data/target/guns/m_60.json +++ b/src/main/resources/data/target/guns/m_60.json @@ -12,5 +12,6 @@ "headshot": 2, "velocity": 40, "mag": 100, - "firemode": 2 + "firemode": 2, + "projectileamount": 1 } \ 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 b8ed7279a..a5456626f 100644 --- a/src/main/resources/data/target/guns/mk_14.json +++ b/src/main/resources/data/target/guns/mk_14.json @@ -10,5 +10,6 @@ "damage": 12, "headshot": 2.5, "velocity": 45, - "mag": 20 + "mag": 20, + "projectileamount": 1 } \ 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 a70880d0b..728e5bc01 100644 --- a/src/main/resources/data/target/guns/rpk.json +++ b/src/main/resources/data/target/guns/rpk.json @@ -11,5 +11,6 @@ "damage": 8.75, "headshot": 2, "velocity": 35, - "mag": 50 + "mag": 50, + "projectileamount": 1 } \ 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 7cc13c764..5bf7128de 100644 --- a/src/main/resources/data/target/guns/sks.json +++ b/src/main/resources/data/target/guns/sks.json @@ -8,5 +8,6 @@ "damage": 9.5, "headshot": 1.75, "velocity": 40, - "mag": 20 + "mag": 20, + v } \ 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 8399019e9..40794e816 100644 --- a/src/main/resources/data/target/guns/svd.json +++ b/src/main/resources/data/target/guns/svd.json @@ -8,5 +8,6 @@ "damage": 18, "headshot": 2.5, "velocity": 50, - "mag": 10 + "mag": 10, + "projectileamount": 1 } \ 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 2966782a5..75678196c 100644 --- a/src/main/resources/data/target/guns/trachelium.json +++ b/src/main/resources/data/target/guns/trachelium.json @@ -8,5 +8,6 @@ "damage": 18, "headshot": 1.5, "velocity": 60, - "mag": 8 + "mag": 8, + "projectileamount": 1 } \ 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 f8842237e..758a61d18 100644 --- a/src/main/resources/data/target/guns/vector.json +++ b/src/main/resources/data/target/guns/vector.json @@ -9,5 +9,6 @@ "damage": 4.5, "headshot": 1.5, "velocity": 22, - "mag": 33 + "mag": 33, + "projectileamount": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/tags/items/normal_mag_gun.json b/src/main/resources/data/target/tags/items/normal_mag_gun.json new file mode 100644 index 000000000..52d01d896 --- /dev/null +++ b/src/main/resources/data/target/tags/items/normal_mag_gun.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "target:ak_47", + "target:svd", + "target:m_60", + "target:mk_14", + "target:vector", + "target:sks", + "target:rpk", + "target:hk_416", + "target:aa_12", + "target:m_4", + "target:devotion", + "target:trachelium", + "target:hunting_rifle" + ] +} \ No newline at end of file