-fixed projectile damage

Author: Smartin-b

common/src/main/java/smartin/miapi/attributes/AttributeRegistry.java

@@ -16,9 +16,9 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import smartin.miapi.entity.ItemProjectileEntity;
 import smartin.miapi.events.MiapiEvents;
 import smartin.miapi.events.MiapiProjectileEvents;
-import smartin.miapi.entity.ItemProjectileEntity;
 import smartin.miapi.modules.abilities.util.WrappedSoundEvent;
 import smartin.miapi.modules.properties.AttributeProperty;
 
@@ -54,7 +54,6 @@ public class AttributeRegistry {
     public static EntityAttribute PROJECTILE_PIERCING;
 
 
-
     public static void setup() {
         MiapiEvents.LIVING_HURT.register((livingHurtEvent -> {
             if (livingHurtEvent.livingEntity.getAttributes().hasAttribute(DAMAGE_RESISTANCE)) {
@@ -116,7 +115,7 @@ public static void setup() {
 
         MiapiProjectileEvents.MODULAR_PROJECTILE_ENTITY_HIT.register(listener -> {
             ItemProjectileEntity projectile = listener.projectile;
-            if(projectile.isCritical()){
+            if (projectile.isCritical()) {
                 projectile.setDamage(projectile.getDamage() * AttributeProperty.getActualValue(projectile.asItemStack(), EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_CRIT_MULTIPLIER));
             }
             return EventResult.pass();

common/src/main/java/smartin/miapi/entity/ItemProjectileEntity.java

@@ -62,6 +62,7 @@ public ItemProjectileEntity(World world, Position position, ItemStack itemStack)
         this.dataTracker.set(THROWING_STACK, thrownStack);
         this.dataTracker.set(LOYALTY, (byte) EnchantmentHelper.getLoyalty(itemStack));
         this.dataTracker.set(ENCHANTED, itemStack.hasGlint());
+        setup();
     }
 
     public ItemProjectileEntity(World world, LivingEntity owner, ItemStack stack) {
@@ -77,9 +78,15 @@ public ItemProjectileEntity(World world, LivingEntity owner, ItemStack stack) {
         if (getBowItem().isEmpty() && owner != null) {
             setBowItem(owner.getActiveItem());
         }
+        setup();
         MiapiProjectileEvents.MODULAR_PROJECTILE_DATA_TRACKER_SET.invoker().dataTracker(this, this.getDataTracker());
     }
 
+    private void setup(){
+        ItemStack projectileStack = this.asItemStack();
+        this.setDamage(AttributeProperty.getActualValue(projectileStack,EquipmentSlot.MAINHAND,AttributeRegistry.PROJECTILE_DAMAGE));
+    }
+
     public void setPreferredSlot(int slotID) {
         this.dataTracker.set(PREFERRED_SLOT, slotID);
     }
@@ -265,7 +272,7 @@ public float getProjectileDamage() {
         float damage = (float) getDamage();
         if (this.getSpeedDamage()) {
             float speed = (float) this.getVelocity().length();
-            damage = damage * speed;
+            damage = MathHelper.ceil(MathHelper.clamp((double)speed * damage, 0.0, 2.147483647E9));
         }
         return damage;
     }

common/src/main/java/smartin/miapi/item/modular/items/ModularBow.java

@@ -21,9 +21,9 @@
 import smartin.miapi.attributes.AttributeRegistry;
 import smartin.miapi.client.model.ModularModelPredicateProvider;
 import smartin.miapi.config.MiapiConfig;
+import smartin.miapi.entity.ItemProjectileEntity;
 import smartin.miapi.events.MiapiProjectileEvents;
 import smartin.miapi.item.modular.ModularItem;
-import smartin.miapi.entity.ItemProjectileEntity;
 import smartin.miapi.modules.properties.AttributeProperty;
 import smartin.miapi.modules.properties.DisplayNameProperty;
 

common/src/main/resources/data/miapi/modules/arrow/head/arrow_custom_head.json

@@ -7,6 +7,13 @@
         "arrow_head"
     ],
     "attributes": [
+        {
+            "attribute": "miapi:generic.projectile_damage",
+            "value": "2",
+            "operation": "+",
+            "slot": "mainhand",
+            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
+        },
         {
             "attribute": "miapi:generic.projectile_speed",
             "value": " - 0.2",

common/src/main/resources/data/miapi/modules/arrow/head/arrow_head.json

@@ -27,6 +27,13 @@
         "arrow_head"
     ],
     "attributes": [
+        {
+            "attribute": "miapi:generic.projectile_damage",
+            "value": "2",
+            "operation": "+",
+            "slot": "mainhand",
+            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
+        },
         {
             "attribute": "miapi:generic.projectile_speed",
             "value": "( - [material.density] ) / 10",