better velocity calculation for kinetic damage

Author: PssbleTrngle

src/main/java/galena/oreganized/mixin/EntityMixin.java

@@ -0,0 +1,32 @@
+package galena.oreganized.mixin;
+
+import galena.oreganized.world.IMotionHolder;
+import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Entity.class)
+public class EntityMixin implements IMotionHolder {
+
+    @Unique
+    private double oreganized$Motion = 0.0;
+
+    @Inject(
+            method = "setOldPosAndRot",
+            at = @At("HEAD")
+    )
+    private void updateMotion(CallbackInfo ci) {
+        var self = (Entity) (Object) this;
+        var deltaX = self.getX() - self.xOld;
+        var deltaZ = self.getZ() - self.zOld;
+        oreganized$Motion = deltaX * deltaX + deltaZ * deltaZ;
+    }
+
+    @Override
+    public double oreganised$getMotion() {
+        return oreganized$Motion;
+    }
+}

src/main/java/galena/oreganized/network/packet/KineticHitPacket.java

@@ -7,10 +7,11 @@
 
 import java.util.function.Supplier;
 
-public record KineticHitPacket(int target) {
+public record KineticHitPacket(int target, double factor) {
 
     public void write(FriendlyByteBuf buffer) {
         buffer.writeInt(target);
+        buffer.writeDouble(factor);
     }
 
     public void handle(Supplier<NetworkEvent.Context> contextSupplier) {
@@ -22,15 +23,16 @@ public void handle(Supplier<NetworkEvent.Context> contextSupplier) {
             var target = level.getEntity(target());
             if (target == null) return;
 
-            KineticDamage.spawnParticles(target);
+            KineticDamage.spawnParticles(target, factor);
         });
 
         context.setPacketHandled(true);
     }
 
     public static KineticHitPacket from(FriendlyByteBuf buffer) {
         var target = buffer.readInt();
-        return new KineticHitPacket(target);
+        var factor = buffer.readDouble();
+        return new KineticHitPacket(target, factor);
     }
 
 }

src/main/java/galena/oreganized/world/IMotionHolder.java

@@ -0,0 +1,7 @@
+package galena.oreganized.world;
+
+public interface IMotionHolder {
+
+    double oreganised$getMotion();
+
+}

src/main/java/galena/oreganized/world/KineticDamage.java

@@ -19,8 +19,12 @@ public static void apply(LivingEntity cause, Entity target) {
         var mods = stack.getAttributeModifiers(EquipmentSlot.MAINHAND).get(OAttributes.KINETIC_DAMAGE.get());
 
         if (mods.isEmpty()) return;
+        if (!(cause instanceof IMotionHolder motionHolder)) return;
 
-        var factor = Math.min(cause.getDeltaMovement().horizontalDistance() / 0.046F, 1F);
+        var motion = Math.sqrt(motionHolder.oreganised$getMotion()) - 0.1;
+
+        var factor = Math.min(motion / 0.2, 1F);
+        if (factor <= 0.0) return;
 
         // ignores modifier operation, since only addition is used by oreganized this works, but may be adapted in the future
         var kineticDamage = factor * mods.stream().mapToDouble(AttributeModifier::getAmount).sum();
@@ -32,13 +36,13 @@ public static void apply(LivingEntity cause, Entity target) {
         target.hurt(source, (float) kineticDamage);
         OreganizedNetwork.CHANNEL.send(
                 PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(target.getX(), target.getY(), target.getZ(), 16.0, target.level().dimension())),
-                new KineticHitPacket(target.getId())
+                new KineticHitPacket(target.getId(), factor)
         );
     }
 
-    public static void spawnParticles(Entity target) {
+    public static void spawnParticles(Entity target, double factor) {
         var level = target.level();
-        var count = 3 + level.random.nextInt(2) + level.random.nextInt(2);
+        var count = (int) (2 + Math.floor(6 * factor));
 
         for (int i = 0; i < count; i++) {
             level.addParticle(

src/main/resources/oreganized.mixins.json

@@ -4,7 +4,7 @@
   "package": "galena.oreganized.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "AbstractArrowMixin", "BlockMixin", "CrossbowMixin", "DispenserBlockMixin", "EnchantmentHelperMixin",
+    "AbstractArrowMixin", "BlockMixin", "CrossbowMixin", "DispenserBlockMixin", "EnchantmentHelperMixin", "EntityMixin",
     "FoodDataMixin", "IceBlockMixin", "MobEffectInstanceMixin", "PillagerMixin", "PlayerMixin"
   ],
   "client": [