From 363fa4d28462e1e38cbd61b51a8f34e4dd68d5a7 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Mon, 6 May 2024 14:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E9=87=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/network/TargetModVariables.java | 2 +- .../target/procedures/AKfireProcedure.java | 49 +- .../target/procedures/Aa12fireProcedure.java | 20 +- .../target/procedures/AbkrfireProcedure.java | 55 +- .../target/procedures/BowlooseProcedure.java | 166 ++--- ...iFangKuaiShiFangKuaiDeWeiZhiProcedure.java | 29 +- .../procedures/DevotiongfireProcedure.java | 21 +- .../target/procedures/Hk416fireProcedure.java | 46 +- .../target/procedures/HrfireProcedure.java | 33 +- .../procedures/HurtcancelProcedure.java | 14 +- .../procedures/KraberfireProcedure.java | 46 +- .../target/procedures/M4fireProcedure.java | 46 +- .../target/procedures/M60fireProcedure.java | 28 +- .../target/procedures/M79fireProcedure.java | 149 ++--- .../target/procedures/M870fireProcedure.java | 46 +- .../target/procedures/M98bfireProcedure.java | 65 +- .../procedures/MarlinfireProcedure.java | 48 +- .../procedures/MinigunfireProcedure.java | 21 +- .../target/procedures/Mk14fireProcedure.java | 30 +- .../MortarYouJiShiTiShiProcedure.java | 103 ++-- .../procedures/PlayerReloadProcedure.java | 565 +++++++++--------- .../procedures/PrepareToZoomProcedure.java | 35 +- .../procedures/QuxiaoshanghaiProcedure.java | 42 +- .../procedures/QuxiaowafangkuaiProcedure.java | 13 +- .../procedures/RengchumortarProcedure.java | 27 +- .../target/procedures/RpgfireProcedure.java | 150 ++--- .../target/procedures/RpkfireProcedure.java | 71 +-- .../SenpaiDangShiTiGengXinKeShiProcedure.java | 38 +- .../procedures/SentinelFireProcedure.java | 79 +-- .../target/procedures/SksfireProcedure.java | 55 +- .../target/procedures/SvdfireProcedure.java | 55 +- ...tDangTouZhiWuJiZhongShiTiShiProcedure.java | 21 +- .../target/procedures/TaserfireProcedure.java | 107 +--- .../procedures/TracheliumfireProcedure.java | 34 +- .../target/procedures/VecfireProcedure.java | 34 +- 35 files changed, 763 insertions(+), 1580 deletions(-) diff --git a/src/main/java/net/mcreator/target/network/TargetModVariables.java b/src/main/java/net/mcreator/target/network/TargetModVariables.java index 15b02d805..165a184c2 100644 --- a/src/main/java/net/mcreator/target/network/TargetModVariables.java +++ b/src/main/java/net/mcreator/target/network/TargetModVariables.java @@ -147,7 +147,7 @@ public class TargetModVariables { public double killind = 0; public void syncPlayerVariables(Entity entity) { - if (entity instanceof ServerPlayer serverPlayer) + if (entity instanceof ServerPlayer) TargetMod.PACKET_HANDLER.send(PacketDistributor.DIMENSION.with(entity.level()::dimension), new PlayerVariablesSyncMessage(this, entity.getId())); } diff --git a/src/main/java/net/mcreator/target/procedures/AKfireProcedure.java b/src/main/java/net/mcreator/target/procedures/AKfireProcedure.java index cc0ed2d0f..74ebb418e 100644 --- a/src/main/java/net/mcreator/target/procedures/AKfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AKfireProcedure.java @@ -1,55 +1,30 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class AKfireProcedure { public static void execute(Entity entity) { - 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 (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()))) { - 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: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"); - } + 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); diff --git a/src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java index 8aa501c41..fd227bec1 100644 --- a/src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Aa12fireProcedure.java @@ -1,30 +1,16 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class Aa12fireProcedure { public static void execute(Entity entity) { - if (entity == null) - return; + if (entity == null) return; ItemStack usehand; - 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 (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/AbkrfireProcedure.java b/src/main/java/net/mcreator/target/procedures/AbkrfireProcedure.java index ee7bd6274..c00c5f6ac 100644 --- a/src/main/java/net/mcreator/target/procedures/AbkrfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AbkrfireProcedure.java @@ -1,61 +1,40 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.RandomSource; 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.minecraft.world.level.GameType; public class AbkrfireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.ABEKIRI.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { for (int index0 = 0; index0 < 8; index0++) { BulletFireNormalProcedure.execute(entity); } - { - if (usehand.hurt(1, RandomSource.create(), null)) { - usehand.shrink(1); - usehand.setDamageValue(0); - } + if (usehand.hurt(1, RandomSource.create(), null)) { + usehand.shrink(1); + usehand.setDamageValue(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, entity.getName().getString(), entity.getDisplayName(), - entity.level().getServer(), entity), - ("particle minecraft:cloud" + (" " + (entity.getX() + 1.8 * entity.getLookAngle().x)) + (" " + (entity.getY() + entity.getBbHeight() - 0.1 + 1.8 * entity.getLookAngle().y)) - + (" " + (entity.getZ() + 1.8 * entity.getLookAngle().z)) + " 0.4 0.4 0.4 0.005 30 force @s")); - } + 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), + ("particle minecraft:cloud" + (" " + (entity.getX() + 1.8 * entity.getLookAngle().x)) + (" " + (entity.getY() + entity.getBbHeight() - 0.1 + 1.8 * entity.getLookAngle().y)) + + (" " + (entity.getZ() + 1.8 * entity.getLookAngle().z)) + " 0.4 0.4 0.4 0.005 30 force @s")); } - 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:abkr_fire_3p player @a ~ ~ ~ 4 1"); - } + 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:abkr_fire_3p 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/BowlooseProcedure.java b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java index 1e9c56845..c4d198822 100644 --- a/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java @@ -5,11 +5,9 @@ import net.mcreator.target.entity.ProjectileEntity; import net.mcreator.target.init.TargetModEntities; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -17,70 +15,50 @@ import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraft.world.level.GameType; import net.minecraft.world.level.Level; public class BowlooseProcedure { public static void execute(Entity entity) { - if (entity == null) - return; + if (entity == null) return; ItemStack usehand = ItemStack.EMPTY; - double power = 0; + double power; power = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power"); - { - 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:bowpull"); - } - } - { - 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:bowpull1p"); - } + 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:bowpull"); + 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:bowpull1p"); } if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power") >= 6) { (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("speed", ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power"))); if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - { - Level projectileLevel = entity.level(); - if (!projectileLevel.isClientSide()) { - Projectile _entityToSpawn = new Object() { - public Projectile getArrow(Level level, Entity shooter, float damage, int knockback, byte piercing) { - AbstractArrow entityToSpawn = new BocekarrowEntity(TargetModEntities.BOCEKARROW.get(), level); - entityToSpawn.setOwner(shooter); - entityToSpawn.setBaseDamage(damage); - entityToSpawn.setKnockback(knockback); - entityToSpawn.setSilent(true); - entityToSpawn.setPierceLevel(piercing); - entityToSpawn.pickup = AbstractArrow.Pickup.ALLOWED; - return entityToSpawn; - } - }.getArrow(projectileLevel, entity, (float) (0.5 * (1 + 0.05 * usehand.getOrCreateTag().getDouble("level"))), 0, (byte) 2); - _entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ()); - _entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) (4 * power), (float) 0.05); - projectileLevel.addFreshEntity(_entityToSpawn); - } + Level projectileLevel = entity.level(); + if (!projectileLevel.isClientSide()) { + Projectile _entityToSpawn = new Object() { + public Projectile getArrow(Level level, Entity shooter, float damage, int knockback, byte piercing) { + AbstractArrow entityToSpawn = new BocekarrowEntity(TargetModEntities.BOCEKARROW.get(), level); + entityToSpawn.setOwner(shooter); + entityToSpawn.setBaseDamage(damage); + entityToSpawn.setKnockback(knockback); + entityToSpawn.setSilent(true); + entityToSpawn.setPierceLevel(piercing); + entityToSpawn.pickup = AbstractArrow.Pickup.ALLOWED; + return entityToSpawn; + } + }.getArrow(projectileLevel, entity, (float) (0.5 * (1 + 0.05 * usehand.getOrCreateTag().getDouble("level"))), 0, (byte) 2); + _entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ()); + _entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) (4 * power), (float) 0.05); + projectileLevel.addFreshEntity(_entityToSpawn); } - { - 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:bowfire1p player @s ~ ~ ~ 10 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:bowfire3p player @a ~ ~ ~ 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), "stopsound @s player target:bowfire3p"); - } + 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:bowfire1p player @s ~ ~ ~ 10 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:bowfire3p player @a ~ ~ ~ 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), "stopsound @s player target:bowfire3p"); } } else { for (int index0 = 0; index0 < 10; index0++) { @@ -91,77 +69,33 @@ public class BowlooseProcedure { entity.level().addFreshEntity(projectile); } } - { - 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:shotfire player @s ~ ~ ~ 10 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:shotfire3p player @a ~ ~ ~ 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), "stopsound @s player target:shotfire3p"); - } + + 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:shotfire player @s ~ ~ ~ 10 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:shotfire3p player @a ~ ~ ~ 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), "stopsound @s player target:shotfire3p"); } } - 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); - }); - } + entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { + capability.recoilhorizon = Math.random() < 0.5 ? -1 : 1; + capability.recoil = 0.1; + capability.firing = 1; + capability.syncPlayerVariables(entity); + }); + if (entity instanceof Player _player) { _player.getCooldowns().addCooldown(_player.getMainHandItem().getItem(), 7); } (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("arrowempty", 7); (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("power", 0); usehand.getOrCreateTag().putDouble("fireanim", 2); - { - double _setval = 1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.firing = _setval; - capability.syncPlayerVariables(entity); - }); - } - if (!(new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; - } - return false; - } - }.checkGamemode(entity))) { - if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(Items.ARROW); - _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); - } + + if (entity instanceof Player player && !player.isCreative()) { + ItemStack _stktoremove = new ItemStack(Items.ARROW); + player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); } } } diff --git a/src/main/java/net/mcreator/target/procedures/ClaymoreMineYouJiFangKuaiShiFangKuaiDeWeiZhiProcedure.java b/src/main/java/net/mcreator/target/procedures/ClaymoreMineYouJiFangKuaiShiFangKuaiDeWeiZhiProcedure.java index 370b9a03e..1ba1b5b39 100644 --- a/src/main/java/net/mcreator/target/procedures/ClaymoreMineYouJiFangKuaiShiFangKuaiDeWeiZhiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ClaymoreMineYouJiFangKuaiShiFangKuaiDeWeiZhiProcedure.java @@ -2,20 +2,19 @@ package net.mcreator.target.procedures; import net.mcreator.target.entity.ClaymoreEntity; import net.mcreator.target.init.TargetModEntities; -import net.minecraft.client.Minecraft; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.*; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.MobSpawnType; +import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.GameType; import net.minecraft.world.level.LevelAccessor; public class ClaymoreMineYouJiFangKuaiShiFangKuaiDeWeiZhiProcedure { public static void execute(LevelAccessor world, double x, double y, double z, Entity entity, ItemStack itemstack) { - if (entity == null) - return; + if (entity == null) return; if (entity instanceof LivingEntity _entity) _entity.swing(InteractionHand.MAIN_HAND, true); if (world instanceof ServerLevel _level) { @@ -30,20 +29,10 @@ public class ClaymoreMineYouJiFangKuaiShiFangKuaiDeWeiZhiProcedure { } _level.addFreshEntity(entityToSpawn); } - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(itemstack.getItem(), 20); - if (!(new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; - } - return false; - } - }.checkGamemode(entity))) { - if (entity instanceof Player _player) { - _player.getInventory().clearOrCountMatchingItems(p -> itemstack.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); + if (entity instanceof Player player) { + player.getCooldowns().addCooldown(itemstack.getItem(), 20); + if (!player.isCreative()) { + player.getInventory().clearOrCountMatchingItems(p -> itemstack.getItem() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); } } } diff --git a/src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java b/src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java index 8a849aad3..d0d4612ef 100644 --- a/src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DevotiongfireProcedure.java @@ -1,30 +1,15 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class DevotiongfireProcedure { public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand; - 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 (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/Hk416fireProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416fireProcedure.java index aa491a881..8e9a4179a 100644 --- a/src/main/java/net/mcreator/target/procedures/Hk416fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Hk416fireProcedure.java @@ -1,33 +1,18 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class Hk416fireProcedure { public static void execute(Entity entity) { - 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 (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()))) { @@ -35,23 +20,14 @@ public class Hk416fireProcedure { _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"); - } - } - { - 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"); - } + + 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)); diff --git a/src/main/java/net/mcreator/target/procedures/HrfireProcedure.java b/src/main/java/net/mcreator/target/procedures/HrfireProcedure.java index 0b767247f..21a33d510 100644 --- a/src/main/java/net/mcreator/target/procedures/HrfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/HrfireProcedure.java @@ -1,43 +1,26 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class HrfireProcedure { public static void execute(Entity entity) { - 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 (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); - if (entity instanceof Player _player) - _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"); - } + 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/HurtcancelProcedure.java b/src/main/java/net/mcreator/target/procedures/HurtcancelProcedure.java index 20d186afc..25f8408a4 100644 --- a/src/main/java/net/mcreator/target/procedures/HurtcancelProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/HurtcancelProcedure.java @@ -1,15 +1,12 @@ package net.mcreator.target.procedures; -import net.minecraft.client.Minecraft; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.GameType; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -33,16 +30,7 @@ public class HurtcancelProcedure { private static void execute(@Nullable Event event, DamageSource damagesource, Entity sourceentity) { if (damagesource == null || sourceentity == null) return; - if (sourceentity instanceof Player && (!sourceentity.isAlive() || 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(sourceentity)) && (damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:arrow_in_brain"))) || damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:mine"))) || damagesource.is(DamageTypes.ARROW))) { + if (sourceentity instanceof Player player && (!sourceentity.isAlive() || player.isSpectator()) && (damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:arrow_in_brain"))) || damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:mine"))) || damagesource.is(DamageTypes.ARROW))) { if (event != null && event.isCancelable()) { event.setCanceled(true); } diff --git a/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java b/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java index ecc41a34c..93a6b5861 100644 --- a/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java @@ -1,33 +1,18 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class KraberfireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.KRABER.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("fireanim", 40); @@ -35,23 +20,14 @@ public class KraberfireProcedure { KraberDsProcedure.execute(entity); if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 40); - { - 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:kraber_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:kraber_fire_3p 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:kraber_fire_3p"); - } + + 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:kraber_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:kraber_fire_3p 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:kraber_fire_3p"); } 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 index 5d7d1d85f..76c5cf03f 100644 --- a/src/main/java/net/mcreator/target/procedures/M4fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M4fireProcedure.java @@ -1,34 +1,19 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class M4fireProcedure { public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand; + if (entity == null) return; ItemStack weaponzoom = 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 (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()))) { @@ -36,23 +21,14 @@ public class M4fireProcedure { _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"); - } - } - { - 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"); - } + + 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)); diff --git a/src/main/java/net/mcreator/target/procedures/M60fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M60fireProcedure.java index f150e30b1..3dab4033f 100644 --- a/src/main/java/net/mcreator/target/procedures/M60fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M60fireProcedure.java @@ -1,31 +1,15 @@ package net.mcreator.target.procedures; -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; +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; - ItemStack usehand; - 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 (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/M79fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java index a74379ea8..dec3f0ec0 100644 --- a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java @@ -1,110 +1,65 @@ package net.mcreator.target.procedures; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.GameType; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.entity.projectile.Projectile; -import net.minecraft.world.entity.projectile.AbstractArrow; -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.server.level.ServerLevel; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.CommandSource; -import net.minecraft.client.Minecraft; - -import net.mcreator.target.network.TargetModVariables; -import net.mcreator.target.init.TargetModItems; -import net.mcreator.target.init.TargetModEntities; -import net.mcreator.target.init.TargetModAttributes; import net.mcreator.target.entity.GunGrenadeEntity; +import net.mcreator.target.init.TargetModAttributes; +import net.mcreator.target.init.TargetModEntities; +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.entity.projectile.AbstractArrow; +import net.minecraft.world.entity.projectile.Projectile; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; public class M79fireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.M_79.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { - 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); - }); - } + entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { + capability.recoilhorizon = Math.random() < 0.5 ? -1 : 1; + capability.recoil = 0.1; + capability.firing = 1; + capability.syncPlayerVariables(entity); + }); + + Level projectileLevel = entity.level(); + if (!projectileLevel.isClientSide()) { + Projectile _entityToSpawn = new Object() { + public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { + AbstractArrow entityToSpawn = new GunGrenadeEntity(TargetModEntities.GUN_GRENADE.get(), level); + entityToSpawn.setOwner(shooter); + entityToSpawn.setBaseDamage(damage); + entityToSpawn.setKnockback(knockback); + entityToSpawn.setSilent(true); + return entityToSpawn; + } + }.getArrow(projectileLevel, entity, (float) ((usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")) * (1 + 0.05 * usehand.getOrCreateTag().getDouble("level"))), 0); + _entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ()); + _entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"), + (float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); + projectileLevel.addFreshEntity(_entityToSpawn); } - { - double _setval = 0.1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.recoil = _setval; - capability.syncPlayerVariables(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), + ("particle minecraft:cloud" + (" " + (entity.getX() + 1.8 * entity.getLookAngle().x)) + (" " + (entity.getY() + entity.getBbHeight() - 0.1 + 1.8 * entity.getLookAngle().y)) + + (" " + (entity.getZ() + 1.8 * entity.getLookAngle().z)) + " 0.1 0.1 0.1 0.002 4 force @s")); } - { - double _setval = 1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.firing = _setval; - capability.syncPlayerVariables(entity); - }); - } - { - Entity _shootFrom = entity; - Level projectileLevel = _shootFrom.level(); - if (!projectileLevel.isClientSide()) { - Projectile _entityToSpawn = new Object() { - public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { - AbstractArrow entityToSpawn = new GunGrenadeEntity(TargetModEntities.GUN_GRENADE.get(), level); - entityToSpawn.setOwner(shooter); - entityToSpawn.setBaseDamage(damage); - entityToSpawn.setKnockback(knockback); - entityToSpawn.setSilent(true); - return entityToSpawn; - } - }.getArrow(projectileLevel, entity, (float) ((usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")) * (1 + 0.05 * usehand.getOrCreateTag().getDouble("level"))), 0); - _entityToSpawn.setPos(_shootFrom.getX(), _shootFrom.getEyeY() - 0.1, _shootFrom.getZ()); - _entityToSpawn.shoot(_shootFrom.getLookAngle().x, _shootFrom.getLookAngle().y, _shootFrom.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"), - (float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); - projectileLevel.addFreshEntity(_entityToSpawn); - } - } - { - 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), - ("particle minecraft:cloud" + (" " + (entity.getX() + 1.8 * entity.getLookAngle().x)) + (" " + (entity.getY() + entity.getBbHeight() - 0.1 + 1.8 * entity.getLookAngle().y)) - + (" " + (entity.getZ() + 1.8 * entity.getLookAngle().z)) + " 0.1 0.1 0.1 0.002 4 force @s")); - } - } - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 15); - { - 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:m79_fire_1p player @a ~ ~ ~ 4 1"); - } + player.getCooldowns().addCooldown(usehand.getItem(), 15); + + 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:m79_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/M870fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java index 4f88d13aa..47e7ee391 100644 --- a/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java @@ -1,33 +1,18 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class M870fireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("forcestop", 1); } @@ -40,23 +25,14 @@ public class M870fireProcedure { _player.getCooldowns().addCooldown(usehand.getItem(), 13); usehand.getOrCreateTag().putDouble("recoil", 1); usehand.getOrCreateTag().putDouble("firing", 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:m870_fire1p player @s ~ ~ ~ 100 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:m870_fire3p 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:m870_fire3p"); - } + + 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:m870_fire1p player @s ~ ~ ~ 100 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:m870_fire3p 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:m870_fire3p"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); usehand.getOrCreateTag().putDouble("fireanim", 2); diff --git a/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java b/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java index a8bc27002..7c701fb92 100644 --- a/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java @@ -1,68 +1,35 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class M98bfireProcedure { public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand; - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.M_98B.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("fireanim", 17); BulletFireNormalProcedure.execute(entity); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 17); - { - 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:m98b_fire_1p player @s ~ ~ ~ 100 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:m98b_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), "playsound target:shift @a ~ ~ ~ 1 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:m98b_fire_3p"); - } - } - { - 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:shift"); - } + player.getCooldowns().addCooldown(usehand.getItem(), 17); + + 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:m98b_fire_1p player @s ~ ~ ~ 100 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:m98b_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), "playsound target:shift @a ~ ~ ~ 1 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:m98b_fire_3p"); + 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:shift"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); } diff --git a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java index 0bbe350b8..97da1c32e 100644 --- a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java @@ -2,35 +2,18 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class MarlinfireProcedure { public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - double ammo1 = 0; - double id = 0; - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("forcestop", 1); } @@ -48,23 +31,14 @@ public class MarlinfireProcedure { usehand.getOrCreateTag().putDouble("firing", 10); } 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:marlin_fire1p player @s ~ ~ ~ 100 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:marlin_fire3p 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:marlin_fire3p"); - } + + 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:marlin_fire1p player @s ~ ~ ~ 100 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:marlin_fire3p 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:marlin_fire3p"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); if (usehand.getOrCreateTag().getDouble("animindex") == 1) { diff --git a/src/main/java/net/mcreator/target/procedures/MinigunfireProcedure.java b/src/main/java/net/mcreator/target/procedures/MinigunfireProcedure.java index dba8eeae4..b9e09976f 100644 --- a/src/main/java/net/mcreator/target/procedures/MinigunfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MinigunfireProcedure.java @@ -1,30 +1,15 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class MinigunfireProcedure { public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand; - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.MINIGUN.get()) { entity.getPersistentData().putDouble("minifiring", 1); } diff --git a/src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java b/src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java index c0170cfa4..ef3c16bd4 100644 --- a/src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Mk14fireProcedure.java @@ -1,44 +1,28 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class Mk14fireProcedure { public static void execute(Entity entity) { - 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 (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"); - } + + 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/MortarYouJiShiTiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/MortarYouJiShiTiShiProcedure.java index 4801b4b72..6284a45c0 100644 --- a/src/main/java/net/mcreator/target/procedures/MortarYouJiShiTiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MortarYouJiShiTiShiProcedure.java @@ -6,7 +6,6 @@ import net.mcreator.target.entity.MortarShellEntity; import net.mcreator.target.init.TargetModEntities; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.world.inventory.MortarGUIMenu; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; @@ -24,7 +23,6 @@ import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.GameType; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraftforge.network.NetworkHooks; @@ -35,18 +33,16 @@ public class MortarYouJiShiTiShiProcedure { return; if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ItemStack.EMPTY.getItem()) { if (sourceentity.isShiftKeyDown()) { - { - Entity _ent = entity; - _ent.setYRot(sourceentity.getYRot()); - _ent.setXRot(entity.getXRot()); - _ent.setYBodyRot(_ent.getYRot()); - _ent.setYHeadRot(_ent.getYRot()); - _ent.yRotO = _ent.getYRot(); - _ent.xRotO = _ent.getXRot(); - if (_ent instanceof LivingEntity _entity) { - _entity.yBodyRotO = _entity.getYRot(); - _entity.yHeadRotO = _entity.getYRot(); - } + + entity.setYRot(sourceentity.getYRot()); + entity.setXRot(entity.getXRot()); + entity.setYBodyRot(entity.getYRot()); + entity.setYHeadRot(entity.getYRot()); + entity.yRotO = entity.getYRot(); + entity.xRotO = entity.getXRot(); + if (entity instanceof LivingEntity _entity) { + _entity.yBodyRotO = _entity.getYRot(); + _entity.yHeadRotO = _entity.getYRot(); } } else { if (sourceentity instanceof ServerPlayer _ent) { @@ -67,64 +63,37 @@ public class MortarYouJiShiTiShiProcedure { } if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MORTAR_SHELLS.get() && !(sourceentity instanceof Player _plrCldCheck10 && _plrCldCheck10.getCooldowns().isOnCooldown(TargetModItems.MORTAR_SHELLS.get()))) { - if (sourceentity instanceof Player _player) - _player.getCooldowns().addCooldown(TargetModItems.MORTAR_SHELLS.get(), 30); - if (!(new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; - } - return false; - } - }.checkGamemode(sourceentity))) { - if (sourceentity instanceof Player _player) { + if (sourceentity instanceof Player player) { + player.getCooldowns().addCooldown(TargetModItems.MORTAR_SHELLS.get(), 30); + if (!player.isCreative()) { ItemStack _stktoremove = new ItemStack(TargetModItems.MORTAR_SHELLS.get()); - _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); + player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); } } - { - 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:mortar_load player @a ~ ~ ~ 1 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:mortar_fire player @a ~ ~ ~ 8 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:mortar_distant player @a ~ ~ ~ 32 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:mortar_load player @a ~ ~ ~ 1 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:mortar_fire player @a ~ ~ ~ 8 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:mortar_distant player @a ~ ~ ~ 32 1"); } TargetMod.queueServerWork(20, () -> { - { - Entity _shootFrom = entity; - Level projectileLevel = _shootFrom.level(); - if (!projectileLevel.isClientSide()) { - Projectile _entityToSpawn = new Object() { - public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { - AbstractArrow entityToSpawn = new MortarShellEntity(TargetModEntities.MORTAR_SHELL.get(), level); - entityToSpawn.setOwner(shooter); - entityToSpawn.setBaseDamage(damage); - entityToSpawn.setKnockback(knockback); - entityToSpawn.setSilent(true); - return entityToSpawn; - } - }.getArrow(projectileLevel, sourceentity, 100, 0); - _entityToSpawn.setPos(_shootFrom.getX(), _shootFrom.getEyeY() - 0.1, _shootFrom.getZ()); - _entityToSpawn.shoot(_shootFrom.getLookAngle().x, _shootFrom.getLookAngle().y, _shootFrom.getLookAngle().z, 8, (float) 0.5); - projectileLevel.addFreshEntity(_entityToSpawn); - } + Level projectileLevel = entity.level(); + if (!projectileLevel.isClientSide()) { + Projectile _entityToSpawn = new Object() { + public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { + AbstractArrow entityToSpawn = new MortarShellEntity(TargetModEntities.MORTAR_SHELL.get(), level); + entityToSpawn.setOwner(shooter); + entityToSpawn.setBaseDamage(damage); + entityToSpawn.setKnockback(knockback); + entityToSpawn.setSilent(true); + return entityToSpawn; + } + }.getArrow(projectileLevel, sourceentity, 100, 0); + _entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ()); + _entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, 8, (float) 0.5); + projectileLevel.addFreshEntity(_entityToSpawn); } if (world instanceof ServerLevel _level) _level.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE, (entity.getX() + 2.2 * entity.getLookAngle().x), (entity.getY() + 0.1 + 2.2 * entity.getLookAngle().y), (entity.getZ() + 2.2 * entity.getLookAngle().z), 40, 0.4, 0.4, 0.4, diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index d71326ce3..0f57c3137 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -2,366 +2,345 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; +import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; 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.minecraft.world.level.GameType; public class PlayerReloadProcedure { public static void execute(Entity entity) { - if (entity == null) - return; - double ammo1 = 0; - double id = 0; - 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))) { + if (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { if (!(entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.TASER.get() - && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 1) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 55); + CompoundTag tag = player.getMainHandItem().getOrCreateTag(); + + if (player.getMainHandItem().getItem() == TargetModItems.TASER.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 1) { + tag.putDouble("reloading", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 55); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.TRACHELIUM.get() - && !(entity instanceof Player _plrCldCheck19 && _plrCldCheck19.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 8 + if (player.getMainHandItem().getItem() == TargetModItems.TRACHELIUM.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 8 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunammo > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 57); + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 57); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.HUNTING_RIFLE.get() - && !(entity instanceof Player _plrCldCheck36 && _plrCldCheck36.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 1 + if (player.getMainHandItem().getItem() == TargetModItems.HUNTING_RIFLE.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 1 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperammo > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 61); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloading", 1); + tag.putDouble("reloadtime", 61); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() - && !(entity instanceof Player _plrCldCheck53 && _plrCldCheck53.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 1 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("maxammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 86); + if (player.getMainHandItem().getItem() == TargetModItems.M_79.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 1 + && tag.getDouble("maxammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 86); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get() - && !(entity instanceof Player _plrCldCheck72 && _plrCldCheck72.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 1 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("maxammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 91); + if (player.getMainHandItem().getItem() == TargetModItems.RPG.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 1 + && tag.getDouble("maxammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 91); } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.ABEKIRI.get() - && !(entity instanceof Player _plrCldCheck91 && _plrCldCheck91.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 2 + if (player.getMainHandItem().getItem() == TargetModItems.ABEKIRI.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 2 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 1) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 83); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 99); + if (tag.getDouble("ammo") == 1) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 83); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 99); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_98B.get() - && !(entity instanceof Player _plrCldCheck121 && _plrCldCheck121.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 6 + if (player.getMainHandItem().getItem() == TargetModItems.M_98B.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 6 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 57); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 79); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 57); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 79); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.KRABER.get() - && !(entity instanceof Player _plrCldCheck151 && _plrCldCheck151.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 5 + if (player.getMainHandItem().getItem() == TargetModItems.KRABER.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 5 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 65); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 83); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 65); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 83); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.VECTOR.get() - && !(entity instanceof Player _plrCldCheck181 && _plrCldCheck181.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 34 + if (player.getMainHandItem().getItem() == TargetModItems.VECTOR.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 34 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 47); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 61); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 47); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 61); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MK_14.get() - && !(entity instanceof Player _plrCldCheck211 && _plrCldCheck211.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 21 + if (player.getMainHandItem().getItem() == TargetModItems.MK_14.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 21 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 45); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 55); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 45); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 55); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.SKS.get() - && !(entity instanceof Player _plrCldCheck241 && _plrCldCheck241.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 21 + if (player.getMainHandItem().getItem() == TargetModItems.SKS.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 21 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 41); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 57); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 41); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 57); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.AK_47.get() - && !(entity instanceof Player _plrCldCheck271 && _plrCldCheck271.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 31 + if (player.getMainHandItem().getItem() == TargetModItems.AK_47.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 31 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 41); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 57); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 41); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 57); } } - if (((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_4.get() - || (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.HK_416.get()) - && !(entity instanceof Player _plrCldCheck303 && _plrCldCheck303.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 31 + if ((player.getMainHandItem().getItem() == TargetModItems.M_4.get() + || player.getMainHandItem().getItem() == TargetModItems.HK_416.get()) + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 31 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 41); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 55); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 41); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 55); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.AA_12.get() - && !(entity instanceof Player _plrCldCheck333 && _plrCldCheck333.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 26 + if (player.getMainHandItem().getItem() == TargetModItems.AA_12.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 26 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 41); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 52); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 41); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 52); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.DEVOTION.get() - && !(entity instanceof Player _plrCldCheck363 && _plrCldCheck363.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 + if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 56) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 51); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 71); + && tag.getDouble("ammo") < 56) { + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 51); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 71); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPK.get() - && !(entity instanceof Player _plrCldCheck393 && _plrCldCheck393.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 + if (player.getMainHandItem().getItem() == TargetModItems.RPK.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 51) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 41); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 57); + && tag.getDouble("ammo") < 51) { + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 41); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 57); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.SENTINEL.get() - && !(entity instanceof Player _plrCldCheck423 && _plrCldCheck423.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 6 + if (player.getMainHandItem().getItem() == TargetModItems.SENTINEL.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 6 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 53); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 73); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 53); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 73); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.SVD.get() - && !(entity instanceof Player _plrCldCheck453 && _plrCldCheck453.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 11 + if (player.getMainHandItem().getItem() == TargetModItems.SVD.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 11 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 41); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 57); + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 41); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 57); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_60.get() - && !(entity instanceof Player _plrCldCheck483 && _plrCldCheck483.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 + if (player.getMainHandItem().getItem() == TargetModItems.M_60.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 100) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 0); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 111); - } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloadtime", 129); + && tag.getDouble("ammo") < 100) { + if (tag.getDouble("ammo") > 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 0); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 111); + } else if (tag.getDouble("ammo") == 0) { + tag.putDouble("reloading", 1); + tag.putDouble("emptyreload", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloadtime", 129); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MARLIN.get() - && !(entity instanceof Player _plrCldCheck513 && _plrCldCheck513.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 8 + if (player.getMainHandItem().getItem() == TargetModItems.MARLIN.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 8 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem(), 5); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("prepare", 5); - { - 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:marlin_start player @s ~ ~ ~ 100 1"); - } + tag.putDouble("reloading", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 5); + tag.putDouble("prepare", 5); + 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:marlin_start player @s ~ ~ ~ 100 1"); } } - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_870.get() - && !(entity instanceof Player _plrCldCheck531 && _plrCldCheck531.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem())) - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 0 - && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") < 8 + if (player.getMainHandItem().getItem() == TargetModItems.M_870.get() + && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) + && tag.getDouble("reloading") == 0 + && tag.getDouble("ammo") < 8 && (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunammo > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("ammo") == 0) { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("emptyreload", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem(), 36); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("prepare", 36); - { - 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:m870_preparealt player @s ~ ~ ~ 100 1"); - } + if (tag.getDouble("ammo") == 0) { + tag.putDouble("emptyreload", 1); + tag.putDouble("reloading", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 36); + tag.putDouble("prepare", 36); + + 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:m870_preparealt player @s ~ ~ ~ 100 1"); } } else { - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("reloading", 1); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); + tag.putDouble("reloading", 1); + tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); if (entity instanceof Player _player) - _player.getCooldowns().addCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem(), 7); - (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("prepare", 7); + _player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 7); + tag.putDouble("prepare", 7); } } } diff --git a/src/main/java/net/mcreator/target/procedures/PrepareToZoomProcedure.java b/src/main/java/net/mcreator/target/procedures/PrepareToZoomProcedure.java index 1d74d6183..070d5c9e2 100644 --- a/src/main/java/net/mcreator/target/procedures/PrepareToZoomProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PrepareToZoomProcedure.java @@ -2,15 +2,12 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -35,31 +32,21 @@ public class PrepareToZoomProcedure { if (entity == null) return; if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).is(ItemTags.create(new ResourceLocation("target:gun"))) - && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 1) && !(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)) && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get())) { - if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) { - entity.setSprinting(false); - { - boolean _setval = true; + && !((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("reloading") == 1) && + entity instanceof Player player && !player.isSpectator()) { + if (!(player.getMainHandItem().getItem() == TargetModItems.MINIGUN.get())) { + if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) { + entity.setSprinting(false); entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.zooming = _setval; + capability.zooming = true; capability.syncPlayerVariables(entity); }); + if (entity.getPersistentData().getDouble("miaozhunshijian") < 10) { + entity.getPersistentData().putDouble("miaozhunshijian", (entity.getPersistentData().getDouble("miaozhunshijian") + 1)); + } + } else { + entity.getPersistentData().putDouble("miaozhunshijian", 0); } - if (entity.getPersistentData().getDouble("miaozhunshijian") < 10) { - entity.getPersistentData().putDouble("miaozhunshijian", (entity.getPersistentData().getDouble("miaozhunshijian") + 1)); - } - } else { - entity.getPersistentData().putDouble("miaozhunshijian", 0); } } } diff --git a/src/main/java/net/mcreator/target/procedures/QuxiaoshanghaiProcedure.java b/src/main/java/net/mcreator/target/procedures/QuxiaoshanghaiProcedure.java index 622e0a0c6..47c228e80 100644 --- a/src/main/java/net/mcreator/target/procedures/QuxiaoshanghaiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/QuxiaoshanghaiProcedure.java @@ -1,17 +1,13 @@ package net.mcreator.target.procedures; import net.mcreator.target.entity.ClaymoreEntity; -import net.minecraft.client.Minecraft; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.GameType; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -35,34 +31,22 @@ public class QuxiaoshanghaiProcedure { private static void execute(@Nullable Event event, DamageSource damagesource, Entity entity, Entity sourceentity) { if (damagesource == null || entity == null || sourceentity == null) return; - if (entity instanceof ClaymoreEntity && !(sourceentity == null) && (entity instanceof TamableAnimal _tamEnt ? (Entity) _tamEnt.getOwner() : null) == sourceentity && !(new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; + if (entity instanceof ClaymoreEntity tamEnt && tamEnt.getOwner() == sourceentity) { + if (tamEnt.getOwner() instanceof Player player && player.isCreative()) { + if (entity instanceof ClaymoreEntity _entity && damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:deleted_mod_element")))) { + entity.setYRot(sourceentity.getYRot()); + entity.setXRot(entity.getXRot()); + entity.setYBodyRot(entity.getYRot()); + entity.setYHeadRot(entity.getYRot()); + entity.yRotO = entity.getYRot(); + entity.xRotO = entity.getXRot(); + _entity.yBodyRotO = _entity.getYRot(); + _entity.yHeadRotO = _entity.getYRot(); } - return false; - } - }.checkGamemode((entity instanceof TamableAnimal _tamEnt ? (Entity) _tamEnt.getOwner() : null)))) { - if (entity instanceof ClaymoreEntity && damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:deleted_mod_element")))) { - { - Entity _ent = entity; - _ent.setYRot(sourceentity.getYRot()); - _ent.setXRot(entity.getXRot()); - _ent.setYBodyRot(_ent.getYRot()); - _ent.setYHeadRot(_ent.getYRot()); - _ent.yRotO = _ent.getYRot(); - _ent.xRotO = _ent.getXRot(); - if (_ent instanceof LivingEntity _entity) { - _entity.yBodyRotO = _entity.getYRot(); - _entity.yHeadRotO = _entity.getYRot(); - } + if (event != null && event.isCancelable()) { + event.setCanceled(true); } } - if (event != null && event.isCancelable()) { - event.setCanceled(true); - } } } } diff --git a/src/main/java/net/mcreator/target/procedures/QuxiaowafangkuaiProcedure.java b/src/main/java/net/mcreator/target/procedures/QuxiaowafangkuaiProcedure.java index 02d8de80a..94ff4c824 100644 --- a/src/main/java/net/mcreator/target/procedures/QuxiaowafangkuaiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/QuxiaowafangkuaiProcedure.java @@ -33,17 +33,8 @@ public class QuxiaowafangkuaiProcedure { private static void execute(@Nullable Event event, Entity entity) { if (entity == null) return; - if (new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; - } - return false; - } - }.checkGamemode(entity)) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.LIGHT_SABER.get()) { + if (entity instanceof Player player && !player.isCreative()) { + if (player.getMainHandItem().getItem() == TargetModItems.LIGHT_SABER.get()) { if (event != null && event.isCancelable()) { event.setCanceled(true); } diff --git a/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java b/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java index 19f64072d..c6d94fdc5 100644 --- a/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RengchumortarProcedure.java @@ -2,23 +2,18 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModEntities; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.GameType; import net.minecraft.world.level.LevelAccessor; public class RengchumortarProcedure { public static void execute(LevelAccessor world, double x, double y, double z, Entity entity) { - if (entity == null) - return; + if (entity == null) return; if (world instanceof ServerLevel _level) { Entity entityToSpawn = TargetModEntities.MORTAR.get().spawn(_level, BlockPos.containing(x + 1.5 * entity.getLookAngle().x, y, z + 1.5 * entity.getLookAngle().z), MobSpawnType.MOB_SUMMONED); if (entityToSpawn != null) { @@ -29,22 +24,10 @@ public class RengchumortarProcedure { entityToSpawn.setDeltaMovement(0, 0, 0); } } - if (!(new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; - } - return false; - } - }.checkGamemode(entity))) { - if (entity instanceof Player _player) { - ItemStack _stktoremove = new ItemStack(TargetModItems.MORTAR_DEPOLYER.get()); - _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); - } + if (entity instanceof Player player && !player.isCreative()) { + ItemStack _stktoremove = new ItemStack(TargetModItems.MORTAR_DEPOLYER.get()); + player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); + player.swing(InteractionHand.MAIN_HAND, true); } - if (entity instanceof LivingEntity _entity) - _entity.swing(InteractionHand.MAIN_HAND, true); } } diff --git a/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java index 53fc744ca..9e67b0de5 100644 --- a/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java @@ -1,115 +1,67 @@ package net.mcreator.target.procedures; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.GameType; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.entity.projectile.Projectile; -import net.minecraft.world.entity.projectile.AbstractArrow; -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.server.level.ServerLevel; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.CommandSource; -import net.minecraft.client.Minecraft; - -import net.mcreator.target.network.TargetModVariables; -import net.mcreator.target.init.TargetModItems; -import net.mcreator.target.init.TargetModEntities; -import net.mcreator.target.init.TargetModAttributes; import net.mcreator.target.entity.RpgRocketEntity; +import net.mcreator.target.init.TargetModAttributes; +import net.mcreator.target.init.TargetModEntities; +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.entity.projectile.AbstractArrow; +import net.minecraft.world.entity.projectile.Projectile; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; public class RpgfireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.RPG.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { - 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); - }); - } + entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { + capability.recoilhorizon = Math.random() < 0.5 ? -1 : 1; + capability.recoil = 0.1; + capability.firing = 1; + capability.syncPlayerVariables(entity); + }); + + Level projectileLevel = entity.level(); + if (!projectileLevel.isClientSide()) { + Projectile _entityToSpawn = new Object() { + public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { + AbstractArrow entityToSpawn = new RpgRocketEntity(TargetModEntities.RPG_ROCKET.get(), level); + entityToSpawn.setOwner(shooter); + entityToSpawn.setBaseDamage(damage); + entityToSpawn.setKnockback(knockback); + entityToSpawn.setSilent(true); + return entityToSpawn; + } + }.getArrow(projectileLevel, entity, (float) ((usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")) * (1 + 0.05 * usehand.getOrCreateTag().getDouble("level"))), 0); + _entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ()); + _entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"), + (float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); + projectileLevel.addFreshEntity(_entityToSpawn); } - { - 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); - }); - } - { - Entity _shootFrom = entity; - Level projectileLevel = _shootFrom.level(); - if (!projectileLevel.isClientSide()) { - Projectile _entityToSpawn = new Object() { - public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { - AbstractArrow entityToSpawn = new RpgRocketEntity(TargetModEntities.RPG_ROCKET.get(), level); - entityToSpawn.setOwner(shooter); - entityToSpawn.setBaseDamage(damage); - entityToSpawn.setKnockback(knockback); - entityToSpawn.setSilent(true); - return entityToSpawn; - } - }.getArrow(projectileLevel, entity, (float) ((usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")) * (1 + 0.05 * usehand.getOrCreateTag().getDouble("level"))), 0); - _entityToSpawn.setPos(_shootFrom.getX(), _shootFrom.getEyeY() - 0.1, _shootFrom.getZ()); - _entityToSpawn.shoot(_shootFrom.getLookAngle().x, _shootFrom.getLookAngle().y, _shootFrom.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"), - (float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); - projectileLevel.addFreshEntity(_entityToSpawn); - } - } - { - 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), - ("particle minecraft:cloud" + (" " + (entity.getX() + 1.8 * entity.getLookAngle().x)) + (" " + (entity.getY() + entity.getBbHeight() - 0.1 + 1.8 * entity.getLookAngle().y)) - + (" " + (entity.getZ() + 1.8 * entity.getLookAngle().z)) + " 0.4 0.4 0.4 0.005 30 force @s")); - } + + 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), + ("particle minecraft:cloud" + (" " + (entity.getX() + 1.8 * entity.getLookAngle().x)) + (" " + (entity.getY() + entity.getBbHeight() - 0.1 + 1.8 * entity.getLookAngle().y)) + + (" " + (entity.getZ() + 1.8 * entity.getLookAngle().z)) + " 0.4 0.4 0.4 0.005 30 force @s")); } if (usehand.getOrCreateTag().getDouble("ammo") == 1) { usehand.getOrCreateTag().putDouble("empty", 1); } - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 10); - { - 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:rpg7_fire player @a ~ ~ ~ 3 1"); - } + player.getCooldowns().addCooldown(usehand.getItem(), 10); + 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:rpg7_fire player @a ~ ~ ~ 3 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/RpkfireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpkfireProcedure.java index 8206c3a1f..2d444a4bf 100644 --- a/src/main/java/net/mcreator/target/procedures/RpkfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpkfireProcedure.java @@ -1,64 +1,39 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class RpkfireProcedure { public static void execute(Entity entity) { - 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.RPK.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); - 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:rpk_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:rpkfire 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:rpkfire"); - } - } - 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); + 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/SenpaiDangShiTiGengXinKeShiProcedure.java b/src/main/java/net/mcreator/target/procedures/SenpaiDangShiTiGengXinKeShiProcedure.java index 9db7617de..a1ac61cef 100644 --- a/src/main/java/net/mcreator/target/procedures/SenpaiDangShiTiGengXinKeShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SenpaiDangShiTiGengXinKeShiProcedure.java @@ -1,47 +1,29 @@ package net.mcreator.target.procedures; -import net.minecraft.client.Minecraft; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.GameType; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import java.util.Comparator; -import java.util.List; public class SenpaiDangShiTiGengXinKeShiProcedure { public static void execute(LevelAccessor world, double x, double y, double z, Entity entity) { - if (entity == null) - return; - double target = 0; + if (entity == null) return; + double target; + entity.getPersistentData().putDouble("findtarget", (entity.getPersistentData().getDouble("findtarget") + 1)); target = entity.getPersistentData().getDouble("findtarget"); - if (target == 1) { - { - final Vec3 _center = new Vec3(x, y, z); - List _entfound = world.getEntitiesOfClass(Entity.class, new AABB(_center, _center).inflate(1024 / 2d), e -> true).stream().sorted(Comparator.comparingDouble(_entcnd -> _entcnd.distanceToSqr(_center))).toList(); - for (Entity entityiterator : _entfound) { - if (entityiterator instanceof Player && !(new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; - } - return false; - } - }.checkGamemode(entityiterator))) { - if (entity instanceof Mob _entity && entityiterator instanceof LivingEntity _ent) - _entity.setTarget(_ent); - } - } - } + if (target == 1 && entity instanceof Mob mob) { + final Vec3 _center = new Vec3(x, y, z); + world.getEntitiesOfClass(Entity.class, new AABB(_center, _center).inflate(1024 / 2d), e -> true) + .stream() + .sorted(Comparator.comparingDouble(e -> e.distanceToSqr(_center))) + .filter(e -> e instanceof Player player && !player.isCreative()) + .forEach(e -> mob.setTarget((LivingEntity) e)); } if (target >= 100) { entity.getPersistentData().putDouble("findtarget", 0); diff --git a/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java b/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java index 4d2034cc5..567e05550 100644 --- a/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java @@ -2,33 +2,18 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class SentinelFireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.SENTINEL.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { if (usehand.getOrCreateTag().getDouble("power") > 0) { @@ -37,19 +22,11 @@ public class SentinelFireProcedure { } else { usehand.getOrCreateTag().putDouble("firing", 24); } - { - 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:sentinelfirecharge1 player @s ~ ~ ~ 100 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:sentinelfirecharge3 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), "playsound target:sentinelfirecharge1 player @s ~ ~ ~ 100 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:sentinelfirecharge3 player @a ~ ~ ~ 4 1"); } if (usehand.getOrCreateTag().getDouble("power") > 20) { usehand.getOrCreateTag().putDouble("power", (usehand.getOrCreateTag().getDouble("power") - 20)); @@ -62,38 +39,22 @@ public class SentinelFireProcedure { } else { usehand.getOrCreateTag().putDouble("firing", 24); } - { - 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:sentinelfire1 player @s ~ ~ ~ 100 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:sentinelfire3 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), "playsound target:sentinelfire1 player @s ~ ~ ~ 100 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:sentinelfire3 player @a ~ ~ ~ 4 1"); } } BulletFireNormalProcedure.execute(entity); usehand.getOrCreateTag().putDouble("crot", 20); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 23); - { - 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:sentinelfire3"); - } - } - { - 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:sentinelfirecharge3"); - } + player.getCooldowns().addCooldown(usehand.getItem(), 23); + + 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:sentinelfire3"); + 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:sentinelfirecharge3"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); usehand.getOrCreateTag().putDouble("fireanim", 2); diff --git a/src/main/java/net/mcreator/target/procedures/SksfireProcedure.java b/src/main/java/net/mcreator/target/procedures/SksfireProcedure.java index b13c338de..176b8dde5 100644 --- a/src/main/java/net/mcreator/target/procedures/SksfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SksfireProcedure.java @@ -1,65 +1,36 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class SksfireProcedure { public static void execute(Entity entity) { - 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 (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); - { - 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"); - } + + 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) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 10); + player.getCooldowns().addCooldown(usehand.getItem(), 10); usehand.getOrCreateTag().putDouble("gj", 1); } else { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 3); + 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 index 4364c1c9d..c7c944c98 100644 --- a/src/main/java/net/mcreator/target/procedures/SvdfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SvdfireProcedure.java @@ -1,65 +1,36 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class SvdfireProcedure { public static void execute(Entity entity) { - 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 (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); - { - 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"); - } + + 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) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 10); + player.getCooldowns().addCooldown(usehand.getItem(), 10); usehand.getOrCreateTag().putDouble("gj", 1); } else { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 5); + 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/TaserBulletDangTouZhiWuJiZhongShiTiShiProcedure.java b/src/main/java/net/mcreator/target/procedures/TaserBulletDangTouZhiWuJiZhongShiTiShiProcedure.java index 367954408..deadbdacb 100644 --- a/src/main/java/net/mcreator/target/procedures/TaserBulletDangTouZhiWuJiZhongShiTiShiProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TaserBulletDangTouZhiWuJiZhongShiTiShiProcedure.java @@ -1,15 +1,11 @@ package net.mcreator.target.procedures; -import net.mcreator.target.entity.Target1Entity; import net.mcreator.target.init.TargetModMobEffects; -import net.minecraft.client.Minecraft; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffectInstance; 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.minecraft.world.level.GameType; public class TaserBulletDangTouZhiWuJiZhongShiTiShiProcedure { public static void execute(Entity entity, Entity immediatesourceentity, Entity sourceentity) { @@ -17,20 +13,9 @@ public class TaserBulletDangTouZhiWuJiZhongShiTiShiProcedure { return; (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().putDouble("hitcount", ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("hitcount") + 1)); - if (!(new Object() { - public boolean checkGamemode(Entity _ent) { - if (_ent instanceof ServerPlayer _serverPlayer) { - return _serverPlayer.gameMode.getGameModeForPlayer() == GameType.CREATIVE; - } 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.CREATIVE; - } - return false; - } - }.checkGamemode(entity))) { - if (!(entity instanceof Target1Entity)) { - if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) - _entity.addEffect(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, 0)); - } + if (entity instanceof Player player && !player.isCreative()) { + if (!player.level().isClientSide()) + player.addEffect(new MobEffectInstance(TargetModMobEffects.SHOCK.get(), 100, 0)); } if (!immediatesourceentity.level().isClientSide()) immediatesourceentity.discard(); diff --git a/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java b/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java index f0aa34a15..9d23fa4b9 100644 --- a/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java @@ -5,97 +5,54 @@ import net.mcreator.target.init.TargetModAttributes; import net.mcreator.target.init.TargetModEntities; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.GameType; import net.minecraft.world.level.Level; public class TaserfireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); if (usehand.getItem() == TargetModItems.TASER.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem())) && usehand.getOrCreateTag().getDouble("ammo") > 0) { - 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); - }); - } + + entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { + capability.recoilhorizon = Math.random() < 0.5 ? -1 : 1; + capability.recoil = 0.1; + capability.firing = 1; + capability.syncPlayerVariables(entity); + }); + player.getCooldowns().addCooldown(usehand.getItem(), 5); + + 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:taserfire player @a ~ ~ ~ 1 1"); } - { - 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); - }); - } - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 5); - { - 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:taserfire player @a ~ ~ ~ 1 1"); - } - } - { - Entity _shootFrom = entity; - Level projectileLevel = _shootFrom.level(); - if (!projectileLevel.isClientSide()) { - Projectile _entityToSpawn = new Object() { - public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { - AbstractArrow entityToSpawn = new TaserBulletProjectileEntity(TargetModEntities.TASER_BULLET_PROJECTILE.get(), level); - entityToSpawn.setOwner(shooter); - entityToSpawn.setBaseDamage(damage); - entityToSpawn.setKnockback(knockback); - entityToSpawn.setSilent(true); - return entityToSpawn; - } - }.getArrow(projectileLevel, entity, (float) (usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")), 0); - _entityToSpawn.setPos(_shootFrom.getX(), _shootFrom.getEyeY() - 0.1, _shootFrom.getZ()); - _entityToSpawn.shoot(_shootFrom.getLookAngle().x, _shootFrom.getLookAngle().y, _shootFrom.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"), - (float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); - projectileLevel.addFreshEntity(_entityToSpawn); - } + + Level projectileLevel = entity.level(); + if (!projectileLevel.isClientSide()) { + Projectile _entityToSpawn = new Object() { + public Projectile getArrow(Level level, Entity shooter, float damage, int knockback) { + AbstractArrow entityToSpawn = new TaserBulletProjectileEntity(TargetModEntities.TASER_BULLET_PROJECTILE.get(), level); + entityToSpawn.setOwner(shooter); + entityToSpawn.setBaseDamage(damage); + entityToSpawn.setKnockback(knockback); + entityToSpawn.setSilent(true); + return entityToSpawn; + } + }.getArrow(projectileLevel, entity, (float) (usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")), 0); + _entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ()); + _entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"), + (float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); + projectileLevel.addFreshEntity(_entityToSpawn); } usehand.getOrCreateTag().putDouble("fireanim", 4); usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); diff --git a/src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java b/src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java index 381b5bd4f..43901140b 100644 --- a/src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TracheliumfireProcedure.java @@ -1,44 +1,26 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class TracheliumfireProcedure { public static void execute(Entity entity) { - 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 (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); - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 4); - { - 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"); - } + 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/VecfireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecfireProcedure.java index 0adb62b48..b7772125e 100644 --- a/src/main/java/net/mcreator/target/procedures/VecfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecfireProcedure.java @@ -1,45 +1,27 @@ package net.mcreator.target.procedures; import net.mcreator.target.init.TargetModItems; -import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; 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.minecraft.world.level.GameType; public class VecfireProcedure { public static void execute(Entity entity) { - 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 (entity == null) return; + if (entity instanceof Player player && !player.isSpectator()) { + ItemStack usehand = player.getMainHandItem(); 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()))) { - if (entity instanceof Player _player) - _player.getCooldowns().addCooldown(usehand.getItem(), 1); + 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"); - } + + 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);