-fix arrowdamage

-buf arrow accuracy(further adjustments needed)
-nerfed arrow crit multiplier

Author: Smartin-b

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

@@ -16,7 +16,7 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import oshi.software.os.unix.aix.AixOSFileStore;
+import smartin.miapi.Miapi;
 import smartin.miapi.entity.ItemProjectileEntity;
 import smartin.miapi.events.MiapiEvents;
 import smartin.miapi.events.MiapiProjectileEvents;
@@ -119,14 +119,15 @@ public static void setup() {
         MiapiProjectileEvents.MODULAR_PROJECTILE_ENTITY_HIT.register(listener -> {
             ItemProjectileEntity projectile = listener.projectile;
             if (projectile.isCritical()) {
-                projectile.setDamage(projectile.getDamage() * AttributeProperty.getActualValue(projectile.asItemStack(), EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_CRIT_MULTIPLIER));
+                listener.damage = (float) (listener.damage * AttributeProperty.getActualValue(projectile.asItemStack(), EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_CRIT_MULTIPLIER));
+                Miapi.DEBUG_LOGGER.warn("criticalArrow " + projectile.getDamage() + " speed " + projectile.getVelocity().length());
             }
             return EventResult.pass();
         });
     }
 
     public static double getAttribute(ItemStack stack, EntityAttribute attribute, EquipmentSlot slot, double defaultValue) {
-        if(!stack.getAttributeModifiers(slot).containsKey(attribute)){
+        if (!stack.getAttributeModifiers(slot).containsKey(attribute)) {
             return attribute.getDefaultValue();
         }
         Collection<EntityAttributeModifier> attributes = stack.getAttributeModifiers(slot).get(attribute);

common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatListWidget.java

@@ -85,6 +85,7 @@ public static void setup() {
                 .setTranslationKey("projectile_speed")
                 .setFormat("##.##")
                 .setDefault(0)
+                .setMin(-3)
                 .setMax(10).build());
         addStatDisplay(AttributeSingleDisplay
                 .builder(AttributeRegistry.PROJECTILE_ACCURACY)
@@ -167,6 +168,11 @@ public static void setup() {
                 .setMax(1)
                 .setTranslationKey(MendingProperty.KEY).build());
 
+        AttributeSingleDisplay.attributesWithDisplay.add(AttributeRegistry.MINING_SPEED_AXE);
+        AttributeSingleDisplay.attributesWithDisplay.add(AttributeRegistry.MINING_SPEED_PICKAXE);
+        AttributeSingleDisplay.attributesWithDisplay.add(AttributeRegistry.MINING_SPEED_HOE);
+        AttributeSingleDisplay.attributesWithDisplay.add(AttributeRegistry.MINING_SPEED_SHOVEL);
+        AttributeSingleDisplay.attributesWithDisplay.add(AttributeRegistry.ARMOR_CRUSHING);
         Registries.ATTRIBUTE.forEach(entityAttribute -> {
             if (!AttributeSingleDisplay.attributesWithDisplay.contains(entityAttribute)) {
                 addStatDisplay(AttributeSingleDisplay

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

@@ -24,6 +24,7 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
+import smartin.miapi.Miapi;
 import smartin.miapi.attributes.AttributeRegistry;
 import smartin.miapi.config.MiapiConfig;
 import smartin.miapi.entity.arrowhitbehaviours.EntityBounceBehaviour;
@@ -231,7 +232,7 @@ protected void onEntityHit(EntityHitResult entityHitResult) {
         }
         damage = event.damage;
         this.dealtDamage = true;
-        if (entity.damage(event.damageSource, damage)) {
+        if (entity.damage(event.damageSource, (float) Math.ceil(damage))) {
             if (entity.getType() == EntityType.ENDERMAN) {
                 return;
             }
@@ -275,8 +276,9 @@ public float getProjectileDamage() {
         float damage = (float) getDamage();
         if (this.getSpeedDamage()) {
             float speed = (float) this.getVelocity().length();
-            damage = MathHelper.ceil(MathHelper.clamp((double) speed * damage, 0.0, 2.147483647E9));
+            damage = (float) MathHelper.clamp((double) speed * damage, 0.0, 2.147483647E9);
         }
+        Miapi.DEBUG_LOGGER.warn("Projectile Damage (arrow) " + getDamage() + " speed " + this.getVelocity().length());
         return damage;
     }
 

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

@@ -18,6 +18,7 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
+import smartin.miapi.Miapi;
 import smartin.miapi.attributes.AttributeRegistry;
 import smartin.miapi.client.model.ModularModelPredicateProvider;
 import smartin.miapi.config.MiapiConfig;
@@ -41,7 +42,7 @@ public ModularBow() {
     }
 
     @Override
-    public boolean isEnchantable(ItemStack itemStack){
+    public boolean isEnchantable(ItemStack itemStack) {
         return true;
     }
 
@@ -99,6 +100,7 @@ public void onStoppedUsing(ItemStack bowStack, World world, LivingEntity user, i
             itemProjectile.setVelocity(playerEntity, playerEntity.getPitch(), playerEntity.getYaw(), 0.0f, pullProgress * speed, divergence);
             if (pullProgress == 1.0f) {
                 itemProjectile.setCritical(true);
+                itemProjectile.isCritical();
             }
             if (powerLevel > 0) {
                 itemProjectile.setDamage(itemProjectile.getDamage() + powerLevel * 0.5 + 0.5);
@@ -121,6 +123,8 @@ public void onStoppedUsing(ItemStack bowStack, World world, LivingEntity user, i
             }
             itemProjectile = event.projectile;
 
+            Miapi.DEBUG_LOGGER.warn("Projectile Damage (bow) " + itemProjectile.getDamage() + " speed " + itemProjectile.getVelocity().length());
+
             world.spawnEntity(itemProjectile);
 
             MiapiProjectileEvents.ModularBowShotEvent postEvent = new MiapiProjectileEvents.ModularBowShotEvent(itemProjectile, bowStack, playerEntity);

common/src/main/java/smartin/miapi/modules/properties/AttributeProperty.java

@@ -140,7 +140,10 @@ private static Map<EquipmentSlot, Multimap<EntityAttribute, EntityAttributeModif
 
     public static Map<EquipmentSlot, Multimap<EntityAttribute, EntityAttributeModifier>> equipmentSlotMultimapMap(ItemStack itemStack) {
         Map<EquipmentSlot, Multimap<EntityAttribute, EntityAttributeModifier>> replaceMap = new EnumMap<>(EquipmentSlot.class);
-        return ModularItemCache.get(itemStack, KEY + "_unmodifieable",replaceMap);
+        for (EquipmentSlot slot : EquipmentSlot.values()) {
+            replaceMap.put(slot, ArrayListMultimap.create());
+        }
+        return ModularItemCache.get(itemStack, KEY + "_unmodifieable", replaceMap);
     }
 
     public static Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiersForSlot(ItemStack itemStack, EquipmentSlot slot, Multimap<EntityAttribute, EntityAttributeModifier> toAdding) {

common/src/main/java/smartin/miapi/modules/properties/HealthPercentDamage.java

@@ -37,7 +37,7 @@ public HealthPercentDamage() {
     public Double getValue(ItemStack stack) {
         Double value = property.getValueRaw(stack);
         if (value == null) {
-            return 0.0;
+            return null;
         }
         return ((200) / (1 + Math.exp(-Math.sqrt(value) / 50))) - 100;
     }

common/src/main/resources/assets/miapi/textures/item/armor/netherite.png

@@ -1,18 +1,34 @@
 {
   "key": "end_rod",
   "translation": "miapi.material.rod.end_rod",
-  "icon": "textures/item/end_rod.png",
+  "icon": {
+    "type": "item",
+    "item": "minecraft:end_rod"
+  },
   "groups": ["rod"],
-  "hardness": 3,
-  "density": 3,
-  "flexibility": 3,
-  "durability": 196,
-  "color": "A39E93",
+  "hardness": 7,
+  "density": 1.5,
+  "flexibility": 0.5,
+  "durability": 587,
+  "color": "A39983",
   "mining_speed": 5,
   "mining_level": 1,
   "textures": [
     "emissive"
   ],
+  "color_palette": {
+    "type": "grayscale_map",
+    "colors": {
+      "24": "373431",
+      "68": "615F4C",
+      "107": "9E9183",
+      "150": "9E9183",
+      "190": "9E9683",
+      "216": "A39E93",
+      "230": "A3A3A3",
+      "255": "F3DFCB"
+    }
+  },
   "items": [
     {
       "item": "minecraft:end_rod",

common/src/main/resources/data/miapi/materials/rod/end_rod.json

@@ -29,14 +29,6 @@
     "wood",
     "rough"
   ],
-  "properties": {
-    "default": {
-      "healthPercent": 50
-    },
-    "armor": {
-      "armor_pen": -20
-    }
-  },
   "items": [
     {
       "item": "minecraft:stick",

common/src/main/resources/data/miapi/materials/wood/wood.json

@@ -39,13 +39,13 @@
         },
         {
             "attribute": "miapi:generic.projectile_speed",
-            "value": "( - [material.density] ) / 10",
+            "value": "( - [material.density] ) / 10 + 0.3",
             "operation": "+",
             "slot": "mainhand"
         },
         {
             "attribute": "miapi:generic.projectile_crit_multiplier",
-            "value": "[material.hardness] / (3.7) - 1",
+            "value": "([material.hardness] / (3.7) - 1)*0.25",
             "operation": "+",
             "slot": "mainhand"
         }