优化爆炸

src/main/java/net/mcreator/target/entity/BocekArrowEntity.java

@@ -149,9 +149,9 @@ public class BocekArrowEntity extends AbstractArrow implements ItemSupplier {
             }
         } else {
             if (entity instanceof Monster monster) {
-                hurt = monster.hurt(TargetModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * damageMultiplier);
+                hurt = monster.hurt(TargetModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i * damageMultiplier);
             } else {
-                hurt = entity.hurt(TargetModDamageTypes.causeArrowInBrainDamage(this.level().registryAccess(), this, this.getOwner()), (float) i);
+                hurt = entity.hurt(TargetModDamageTypes.causeArrowInKneeDamage(this.level().registryAccess(), this, this.getOwner()), (float) i);
             }
         }
 

src/main/java/net/mcreator/target/entity/ClaymoreEntity.java

@@ -1,9 +1,8 @@
 package net.mcreator.target.entity;
 
 import net.mcreator.target.TargetMod;
-import net.mcreator.target.init.TargetModDamageTypes;
+import net.mcreator.target.init.*;
-import net.mcreator.target.init.TargetModEntities;
+import net.mcreator.target.network.TargetModVariables;
-import net.mcreator.target.init.TargetModItems;
 import net.mcreator.target.tools.CustomExplosion;
 import net.mcreator.target.tools.ParticleTool;
 import net.minecraft.core.registries.Registries;
@@ -28,6 +27,7 @@ import net.minecraft.world.entity.projectile.ThrownPotion;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.AABB;
@@ -249,13 +249,11 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
 
     private void triggerExplode(Entity target) {
         CustomExplosion explosion = new CustomExplosion(this.level(), this,
-                TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 150f,
+                TargetModDamageTypes.causeMineDamage(this.level().registryAccess(), this.getOwner()), 150f,
                 target.getX(), target.getY(), target.getZ(), 4f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(1);
         explosion.explode();
         net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion);
         explosion.finalizeExplosion(false);
-
-        ParticleTool.spawnMediumExplosionParticles(this.level(), this.position());
     }
 
     @Override

src/main/java/net/mcreator/target/entity/GunGrenadeEntity.java

@@ -171,7 +171,7 @@ public class GunGrenadeEntity extends ThrowableItemProjectile {
 
     private void causeExplode() {
         CustomExplosion explosion = new CustomExplosion(this.level(), this,
-                TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 72f,
+                TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 1.8f * this.damage,
                 this.getX(), this.getY(), this.getZ(), 7.5f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(this.monsterMultiplier);
         explosion.explode();
         net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion);

src/main/java/net/mcreator/target/entity/ProjectileEntity.java

@@ -198,10 +198,10 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
         boolean legshot = false;
         float eyeHeight = entity.getEyeHeight();
         float BodyHeight = entity.getBbHeight();
-        if ((eyeHeight - 0.35) < hitBoxPos.y && hitBoxPos.y < (eyeHeight + 0.4)) {
+        if ((eyeHeight - 0.35) < hitBoxPos.y && hitBoxPos.y < (eyeHeight + 0.4) && !(entity instanceof ClaymoreEntity || entity instanceof MortarEntity)) {
             headshot = true;
         }
-        if (hitBoxPos.y < (0.33 * BodyHeight)) {
+        if (hitBoxPos.y < (0.33 * BodyHeight) && !(entity instanceof ClaymoreEntity || entity instanceof MortarEntity)) {
             legshot = true;
         }
 

src/main/java/net/mcreator/target/entity/RpgRocketEntity.java

@@ -185,7 +185,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile {
 
     private void causeExplode() {
         CustomExplosion explosion = new CustomExplosion(this.level(), this,
-                TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), 100f,
+                TargetModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), (float) 2 / 3 * this.damage,
                 this.getX(), this.getY(), this.getZ(), 10f, Explosion.BlockInteraction.KEEP).setDamageMultiplier(this.monsterMultiplier);
         explosion.explode();
         net.minecraftforge.event.ForgeEventFactory.onExplosionStart(this.level(), explosion);

src/main/java/net/mcreator/target/event/LivingEventHandler.java

@@ -43,15 +43,6 @@ public class LivingEventHandler {
         reduceBulletDamage(event, event.getSource(), event.getEntity(), event.getSource().getEntity(), event.getAmount());
     }
 
-    @SubscribeEvent
-    public static void onEntityAttacked(LivingAttackEvent event) {
-        if (event == null || event.getEntity() == null) {
-            return;
-        }
-
-        claymoreDamage(event);
-    }
-
     @SubscribeEvent
     public static void onEntityDeath(LivingDeathEvent event) {
         if (event == null || event.getEntity() == null) {
@@ -72,7 +63,7 @@ public class LivingEventHandler {
         if (damagesource.is(TargetModDamageTypes.ARROW_IN_KNEE) || 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))
+        if ((damagesource.is(TargetModDamageTypes.PROJECTILE_BOOM) || damagesource.is(DamageTypes.ARROW))
                 && (stack.getItem() == TargetModItems.M_79.get() || stack.getItem() == TargetModItems.RPG.get())
         ) {
             stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage);
@@ -94,10 +85,10 @@ public class LivingEventHandler {
             }
             event.setAmount((float) damage);
             stack.getOrCreateTag().putDouble("damagetotal", stack.getOrCreateTag().getDouble("damagetotal") + damage);
+        }
 
-            if (entity instanceof Target1Entity && sourceentity instanceof Player player) {
+        if (entity instanceof Target1Entity && sourceentity instanceof Player player) {
-                player.displayClientMessage(Component.literal("Damage:" + new java.text.DecimalFormat("##.#").format(damage) + " Distance:" + new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceentity.position()))) + "M"), false);
+            player.displayClientMessage(Component.literal("Damage:" + new java.text.DecimalFormat("##.#").format(damage) + " Distance:" + new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceentity.position()))) + "M"), false);
-            }
         }
     }
 
@@ -105,21 +96,6 @@ public class LivingEventHandler {
         return amount / (1 + rate * Math.max(0, distance - minDistance));
     }
 
-    private static void claymoreDamage(LivingAttackEvent event) {
-        LivingEntity entity = event.getEntity();
-        DamageSource source = event.getSource();
-        Entity sourceentity = source.getEntity();
-
-        if (event.getEntity() == null || entity == null || sourceentity == null) {
-            return;
-        }
-
-        if ((source.is(DamageTypes.EXPLOSION) || source.is(DamageTypes.PLAYER_EXPLOSION)) && sourceentity instanceof ClaymoreEntity claymore) {
-            event.setCanceled(true);
-            entity.hurt(TargetModDamageTypes.causeMineDamage(entity.level().registryAccess(), claymore.getOwner()), event.getAmount());
-        }
-    }
-
     private static void killIndication(Entity sourceEntity) {
         if (sourceEntity == null) {
             return;

src/main/java/net/mcreator/target/procedures/M79fireProcedure.java

@@ -36,7 +36,7 @@ public class M79fireProcedure {
                 Level level = entity.level();
                 if (!level.isClientSide()) {
                     int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), stack);
-                    GunGrenadeEntity gunGrenadeEntity = new GunGrenadeEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage"), monsterMultiple);
+                    GunGrenadeEntity gunGrenadeEntity = new GunGrenadeEntity(player, level, (float) stack.getOrCreateTag().getDouble("damage") * (float) stack.getOrCreateTag().getDouble("damageadd"), monsterMultiple);
 
                     gunGrenadeEntity.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ());
                     gunGrenadeEntity.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) stack.getOrCreateTag().getDouble("velocity"),

src/main/java/net/mcreator/target/procedures/RpgFireProcedure.java

@@ -39,7 +39,7 @@ public class RpgFireProcedure {
 
             if (!level.isClientSide()) {
                 int monsterMultiple = EnchantmentHelper.getTagEnchantmentLevel(TargetModEnchantments.MONSTER_HUNTER.get(), mainHandItem);
-                RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level, (float) tag.getDouble("damage"), monsterMultiple);
+                RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level, (float) tag.getDouble("damage") * (float) tag.getDouble("damageadd"), monsterMultiple);
                 rocketEntity.setPos(player.getX(), player.getEyeY() - 0.1, player.getZ());
                 rocketEntity.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, (float) tag.getDouble("velocity"),
                         (float) player.getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue());

src/main/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "target:barbed_wire"
+  ]
+}

src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "target:sandbag"
+  ]
+}