diff --git a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java index 58f61fa0e..dfb6b8c0c 100644 --- a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java +++ b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java @@ -3,6 +3,7 @@ package net.mcreator.target.event; import net.mcreator.target.entity.BocekarrowEntity; import net.mcreator.target.entity.Target1Entity; import net.mcreator.target.init.TargetModDamageTypes; +import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModTags; import net.mcreator.target.item.gun.GunItem; import net.mcreator.target.network.TargetModVariables; @@ -18,6 +19,7 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.LevelAccessor; @@ -36,6 +38,7 @@ public class LivingEntityEventHandler { if (event == null || event.getEntity() == null) return; renderDamageIndicator(event); target1DamageImmune(event, event.getEntity()); + reduceBulletDamage(event, event.getSource(), event.getEntity(), event.getSource().getEntity(), event.getAmount()); } @SubscribeEvent @@ -52,6 +55,43 @@ public class LivingEntityEventHandler { killIndication(event.getSource().getEntity()); } + private static void reduceBulletDamage(LivingHurtEvent event, DamageSource damagesource, LivingEntity entity, Entity sourceentity, double amount) { + if (damagesource == null || entity == null || sourceentity == null) return; + + double damage = amount; + ItemStack stack = sourceentity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY; + if (damagesource.is(TargetModDamageTypes.ARROW_IN_BRAIN)) { + stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); + } + if ((damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) + && (stack.getItem() == TargetModItems.M_79.get() || stack.getItem() == TargetModItems.RPG.get()) + ) { + stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); + } + + if (damagesource.is(TargetModDamageTypes.GUNFIRE)) { + double distance = entity.position().distanceTo(sourceentity.position()); + + if (stack.is(TargetModTags.Items.SHOTGUN) || stack.getItem() == TargetModItems.BOCEK.get()) { + damage = reduceDamageByDistance(amount, distance, 0.05, 20); + } else if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { + damage = reduceDamageByDistance(amount, distance, 0.001, 200); + } else if (stack.is(TargetModTags.Items.HANDGUN)) { + damage = reduceDamageByDistance(amount, distance, 0.04, 40); + } else if (stack.is(TargetModTags.Items.SMG)) { + damage = reduceDamageByDistance(amount, distance, 0.03, 50); + } else if (stack.is(TargetModTags.Items.RIFLE)) { + damage = reduceDamageByDistance(amount, distance, 0.005, 100); + } + event.setAmount((float) damage); + stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage); + } + } + + private static double reduceDamageByDistance(double amount, double distance, double rate, double minDistance) { + return amount / (1 + rate * Math.max(0, distance - minDistance)); + } + private static void target1DamageImmune(Event event, Entity entity) { if (entity == null) return; if (entity instanceof Target1Entity && entity.getPersistentData().getDouble("targetdown") > 0) { diff --git a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java b/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java deleted file mode 100644 index f04aea38d..000000000 --- a/src/main/java/net/mcreator/target/procedures/DamageReduceProcedure.java +++ /dev/null @@ -1,94 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.damagesource.DamageTypes; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class DamageReduceProcedure { - @SubscribeEvent - public static void onEntityAttacked(LivingHurtEvent event) { - if (event != null && event.getEntity() != null) { - execute(event, event.getSource(), event.getEntity(), event.getSource().getEntity(), event.getAmount()); - } - } - - public static void execute(DamageSource damagesource, Entity entity, Entity sourceentity, double amount) { - execute(null, damagesource, entity, sourceentity, amount); - } - - private static void execute(@Nullable Event event, DamageSource damagesource, Entity entity, Entity sourceentity, double amount) { - if (damagesource == null || entity == null || sourceentity == null) - return; - double distanse = 0; - double damage = 0; - ItemStack stack; - if (damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:arrow_in_brain")))) { - stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - damage = amount; - stack.getOrCreateTag().putDouble("damagetotal", (stack.getOrCreateTag().getDouble("damagetotal") + damage)); - } - if (damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) { - stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get() - || (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get()) { - damage = amount; - stack.getOrCreateTag().putDouble("damagetotal", (stack.getOrCreateTag().getDouble("damagetotal") + damage)); - } - } - if (damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:gunfire")))) { - stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - distanse = (entity.position()).distanceTo((sourceentity.position())); - if (stack.is(ItemTags.create(new ResourceLocation("target:shotgun"))) || stack.getItem() == TargetModItems.BOCEK.get()) { - if (distanse > 20) { - ((LivingHurtEvent) event).setAmount(((float) (amount / (1 + 0.05 * (distanse - 20))))); - damage = amount / (1 + 0.05 * (distanse - 20)); - } else { - damage = amount; - } - } else if (stack.is(ItemTags.create(new ResourceLocation("target:sniperrifle")))) { - if (distanse > 200) { - ((LivingHurtEvent) event).setAmount(((float) (amount / (1 + 0.001 * (distanse - 200))))); - damage = amount / (1 + 0.001 * (distanse - 200)); - } else { - damage = amount; - } - } else if (stack.is(ItemTags.create(new ResourceLocation("target:handgun")))) { - if (distanse > 40) { - ((LivingHurtEvent) event).setAmount(((float) (amount / (1 + 0.04 * (distanse - 40))))); - damage = amount / (1 + 0.04 * (distanse - 40)); - } else { - damage = amount; - } - } else if (stack.is(ItemTags.create(new ResourceLocation("target:smg")))) { - if (distanse > 50) { - ((LivingHurtEvent) event).setAmount(((float) (amount / (1 + 0.03 * (distanse - 50))))); - damage = amount / (1 + 0.03 * (distanse - 50)); - } else { - damage = amount; - } - } else if (stack.is(ItemTags.create(new ResourceLocation("target:rifle")))) { - if (distanse > 100) { - ((LivingHurtEvent) event).setAmount(((float) (amount / (1 + 0.005 * (distanse - 100))))); - } else { - damage = amount; - } - damage = amount / (1 + 0.005 * (distanse - 100)); - } - stack.getOrCreateTag().putDouble("damagetotal", (stack.getOrCreateTag().getDouble("damagetotal") + damage)); - } - } -}