full damage utils refactor

src/main/java/meteordevelopment/meteorclient/events/entity/DamageEvent.java

@@ -13,12 +13,12 @@ public class DamageEvent {
 
     public LivingEntity entity;
     public DamageSource source;
-    public float amount;
+    @Deprecated(forRemoval = true)
+    public final float amount = 0;
 
-    public static DamageEvent get(LivingEntity entity, DamageSource source, float amount) {
+    public static DamageEvent get(LivingEntity entity, DamageSource source) {
         INSTANCE.entity = entity;
         INSTANCE.source = source;
-        INSTANCE.amount = amount;
         return INSTANCE;
     }
 }

src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayerEntityMixin.java

@@ -74,7 +74,7 @@ private void onPushOutOfBlocks(double x, double d, CallbackInfo info) {
 
     @Inject(method = "damage", at = @At("HEAD"))
     private void onDamage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> info) {
-        if (Utils.canUpdate() && getWorld().isClient && canTakeDamage()) MeteorClient.EVENT_BUS.post(DamageEvent.get(this, source, amount));
+        if (Utils.canUpdate() && getWorld().isClient && canTakeDamage()) MeteorClient.EVENT_BUS.post(DamageEvent.get(this, source));
     }
 
     @ModifyConstant(method = "canSprint", constant = @Constant(floatValue = 6.0f))

src/main/java/meteordevelopment/meteorclient/mixin/LivingEntityMixin.java

@@ -54,7 +54,7 @@ public LivingEntityMixin(EntityType<?> type, World world) {
     @Inject(method = "damage", at = @At("HEAD"))
     private void onDamageHead(DamageSource source, float amount, CallbackInfoReturnable<Boolean> info) {
         if (Utils.canUpdate() && getWorld().isClient)
-            MeteorClient.EVENT_BUS.post(DamageEvent.get((LivingEntity) (Object) this, source, amount));
+            MeteorClient.EVENT_BUS.post(DamageEvent.get((LivingEntity) (Object) this, source));
     }
 
     @ModifyReturnValue(method = "canWalkOnFluid", at = @At("RETURN"))

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AnchorAura.java

@@ -27,6 +27,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
+import org.jetbrains.annotations.Nullable;
 
 public class AnchorAura extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -225,6 +226,7 @@ public class AnchorAura extends Module {
     private int placeDelayLeft;
     private int breakDelayLeft;
     private PlayerEntity target;
+    private final BlockPos.Mutable mutable = new BlockPos.Mutable();
 
     public AnchorAura() {
         super(Categories.Combat, "anchor-aura", "Automatically places and breaks Respawn Anchors to harm entities.");
@@ -264,7 +266,8 @@ private void onTick(TickEvent.Post event) {
                 breakDelayLeft = 0;
 
                 if (rotationMode.get() == RotationMode.Both || rotationMode.get() == RotationMode.Break) {
-                    Rotations.rotate(Rotations.getYaw(breakPos), Rotations.getPitch(breakPos), 50, () -> breakAnchor(breakPos, anchor, glowStone));
+                    BlockPos immutableBreakPos = breakPos.toImmutable();
+                    Rotations.rotate(Rotations.getYaw(breakPos), Rotations.getPitch(breakPos), 50, () -> breakAnchor(immutableBreakPos, anchor, glowStone));
                 } else breakAnchor(breakPos, anchor, glowStone);
             }
         }
@@ -274,7 +277,7 @@ private void onTick(TickEvent.Post event) {
 
             if (placePos != null) {
                 placeDelayLeft = 0;
-                BlockUtils.place(placePos, anchor, (rotationMode.get() == RotationMode.Place || rotationMode.get() == RotationMode.Both), 50);
+                BlockUtils.place(placePos.toImmutable(), anchor, (rotationMode.get() == RotationMode.Place || rotationMode.get() == RotationMode.Both), 50);
             }
         }
 
@@ -301,48 +304,50 @@ private void onRender(Render3DEvent event) {
         }
     }
 
+    @Nullable
     private BlockPos findPlacePos(BlockPos targetPlacePos) {
         switch (placePositions.get()) {
-            case All:
-                if (isValidPlace(targetPlacePos.down())) return targetPlacePos.down();
-                else if (isValidPlace(targetPlacePos.up(2))) return targetPlacePos.up(2);
-                else if (isValidPlace(targetPlacePos.add(1, 0, 0))) return targetPlacePos.add(1, 0, 0);
-                else if (isValidPlace(targetPlacePos.add(-1, 0, 0))) return targetPlacePos.add(-1, 0, 0);
-                else if (isValidPlace(targetPlacePos.add(0, 0, 1))) return targetPlacePos.add(0, 0, 1);
-                else if (isValidPlace(targetPlacePos.add(0, 0, -1))) return targetPlacePos.add(0, 0, -1);
-                else if (isValidPlace(targetPlacePos.add(1, 1, 0))) return targetPlacePos.add(1, 1, 0);
-                else if (isValidPlace(targetPlacePos.add(-1, -1, 0))) return targetPlacePos.add(-1, -1, 0);
-                else if (isValidPlace(targetPlacePos.add(0, 1, 1))) return targetPlacePos.add(0, 1, 1);
-                else if (isValidPlace(targetPlacePos.add(0, 0, -1))) return targetPlacePos.add(0, 0, -1);
-                break;
-            case Above:
-                if (isValidPlace(targetPlacePos.up(2))) return targetPlacePos.up(2);
-                break;
-            case AboveAndBelow:
-                if (isValidPlace(targetPlacePos.down())) return targetPlacePos.down();
-                else if (isValidPlace(targetPlacePos.up(2))) return targetPlacePos.up(2);
-                break;
-            case Around:
-                if (isValidPlace(targetPlacePos.north())) return targetPlacePos.north();
-                else if (isValidPlace(targetPlacePos.east())) return targetPlacePos.east();
-                else if (isValidPlace(targetPlacePos.west())) return targetPlacePos.west();
-                else if (isValidPlace(targetPlacePos.south())) return targetPlacePos.south();
-                break;
+            case All -> {
+                if (isValidPlace(BlockUtils.mutateDown(mutable, targetPlacePos))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateUp(mutable, targetPlacePos, 2))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, 1, 0, 0))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, -1, 0, 0))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, 0, 0, 1))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, 0, 0, -1))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, 1, 1, 0))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, -1, -1, 0))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, 0, 1, 1))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateAround(mutable, targetPlacePos, 0, 0, -1))) return mutable;
+            }
+            case Above -> {
+                if (isValidPlace(BlockUtils.mutateUp(mutable, targetPlacePos, 2))) return mutable;
+            }
+            case AboveAndBelow -> {
+                if (isValidPlace(BlockUtils.mutateDown(mutable, targetPlacePos))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateUp(mutable, targetPlacePos, 2))) return mutable;
+            }
+            case Around -> {
+                if (isValidPlace(BlockUtils.mutateNorth(mutable, targetPlacePos))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateEast(mutable, targetPlacePos))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateWest(mutable, targetPlacePos))) return mutable;
+                else if (isValidPlace(BlockUtils.mutateSouth(mutable, targetPlacePos))) return mutable;
+            }
         }
         return null;
     }
 
+    @Nullable
     private BlockPos findBreakPos(BlockPos targetPos) {
-        if (isValidBreak(targetPos.down())) return targetPos.down();
-        else if (isValidBreak(targetPos.up(2))) return targetPos.up(2);
-        else if (isValidBreak(targetPos.add(1, 0, 0))) return targetPos.add(1, 0, 0);
-        else if (isValidBreak(targetPos.add(-1, 0, 0))) return targetPos.add(-1, 0, 0);
-        else if (isValidBreak(targetPos.add(0, 0, 1))) return targetPos.add(0, 0, 1);
-        else if (isValidBreak(targetPos.add(0, 0, -1))) return targetPos.add(0, 0, -1);
-        else if (isValidBreak(targetPos.add(1, 1, 0))) return targetPos.add(1, 1, 0);
-        else if (isValidBreak(targetPos.add(-1, -1, 0))) return targetPos.add(-1, -1, 0);
-        else if (isValidBreak(targetPos.add(0, 1, 1))) return targetPos.add(0, 1, 1);
-        else if (isValidBreak(targetPos.add(0, 0, -1))) return targetPos.add(0, 0, -1);
+        if (isValidBreak(BlockUtils.mutateDown(mutable, targetPos))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateUp(mutable, targetPos, 2))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, 1, 0, 0))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, -1, 0, 0))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, 0, 0, 1))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, 0, 0, -1))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, 1, 1, 0))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, -1, -1, 0))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, 0, 1, 1))) return mutable;
+        else if (isValidBreak(BlockUtils.mutateAround(mutable, targetPos, 0, 0, -1))) return mutable;
         return null;
     }
 

src/main/java/meteordevelopment/meteorclient/systems/modules/misc/AutoLog.java

@@ -113,13 +113,13 @@ private void onTick(TickEvent.Post event) {
         }
 
         for (Entity entity : mc.world.getEntities()) {
-            if (entity instanceof PlayerEntity && entity.getUuid() != mc.player.getUuid()) {
-                if (onlyTrusted.get() && entity != mc.player && !Friends.get().isFriend((PlayerEntity) entity)) {
+            if (entity instanceof PlayerEntity player && player != mc.player) {
+                if (onlyTrusted.get() && !Friends.get().isFriend(player)) {
                         mc.player.networkHandler.onDisconnect(new DisconnectS2CPacket(Text.literal("[AutoLog] A non-trusted player appeared in your render distance.")));
                         if (toggleOff.get()) this.toggle();
                         break;
                 }
-                if (PlayerUtils.isWithin(entity, 8) && instantDeath.get() && DamageUtils.getSwordDamage((PlayerEntity) entity, true)
+                if (PlayerUtils.isWithin(player, 8) && instantDeath.get() && DamageUtils.getAttackDamage(player, mc.player)
                         > playerHealth + mc.player.getAbsorptionAmount()) {
                     mc.player.networkHandler.onDisconnect(new DisconnectS2CPacket(Text.literal("[AutoLog] Anti-32k measures.")));
                     if (toggleOff.get()) this.toggle();

src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Step.java

@@ -16,8 +16,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.decoration.EndCrystalEntity;
 
-import java.util.Comparator;
-import java.util.Optional;
+import java.util.OptionalDouble;
 
 public class Step extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -91,13 +90,13 @@ private float getHealth(){
         return mc.player.getHealth() + mc.player.getAbsorptionAmount();
     }
 
-    private double getExplosionDamage(){
-        Optional<EndCrystalEntity> crystal = Streams.stream(mc.world.getEntities())
+    private double getExplosionDamage() {
+        OptionalDouble crystalDamage = Streams.stream(mc.world.getEntities())
                 .filter(entity -> entity instanceof EndCrystalEntity)
                 .filter(Entity::isAlive)
-                .max(Comparator.comparingDouble(o -> DamageUtils.crystalDamage(mc.player, o.getPos())))
-                .map(entity -> (EndCrystalEntity) entity);
-        return crystal.map(endCrystalEntity -> DamageUtils.crystalDamage(mc.player, endCrystalEntity.getPos())).orElse(0.0);
+                .mapToDouble(entity -> DamageUtils.crystalDamage(mc.player, entity.getPos()))
+                .max();
+        return crystalDamage.orElse(0.0);
     }
 
     public enum ActiveWhen {

src/main/java/meteordevelopment/meteorclient/utils/entity/EntityAttributeManager.java

@@ -0,0 +1,77 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.utils.entity;
+
+import com.google.common.collect.Multimap;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.attribute.*;
+import net.minecraft.item.ItemStack;
+
+import static meteordevelopment.meteorclient.MeteorClient.mc;
+
+public class EntityAttributeManager {
+    /**
+     * @see LivingEntity#getAttributes()
+     */
+    public static AttributeContainer getAttributes(LivingEntity entity) {
+        if (entity == mc.player) return entity.getAttributes();
+
+        @SuppressWarnings("unchecked")
+        AttributeContainer attributes = new AttributeContainer(DefaultAttributeRegistry.get((EntityType<? extends LivingEntity>) entity.getType()));
+
+        // Equipment
+        for (var equipmentSlot : EquipmentSlot.values()) {
+            ItemStack stack = entity.getEquippedStack(equipmentSlot);
+            attributes.addTemporaryModifiers(stack.getAttributeModifiers(equipmentSlot));
+        }
+
+        // Status effects
+        for (var statusEffect : entity.getStatusEffects()) {
+            statusEffect.getEffectType().onApplied(entity, attributes, statusEffect.getAmplifier());
+        }
+
+        return attributes;
+    }
+
+    /**
+     * @see LivingEntity#getAttributeInstance(EntityAttribute)
+     */
+    public static EntityAttributeInstance getAttributeInstance(LivingEntity entity, EntityAttribute attribute) {
+        if (entity == mc.player) return entity.getAttributeInstance(attribute);
+
+        @SuppressWarnings("unchecked")
+        double baseValue = DefaultAttributeRegistry.get((EntityType<? extends LivingEntity>) entity.getType()).getBaseValue(attribute);
+        EntityAttributeInstance attributeInstance = new EntityAttributeInstance(attribute, o1 -> {});
+        attributeInstance.setBaseValue(baseValue);
+
+        // Equipment
+        for (var equipmentSlot : EquipmentSlot.values()) {
+            ItemStack stack = entity.getEquippedStack(equipmentSlot);
+            Multimap<EntityAttribute, EntityAttributeModifier> modifiers = stack.getAttributeModifiers(equipmentSlot);
+            for (var modifier : modifiers.get(attribute)) attributeInstance.addTemporaryModifier(modifier);
+        }
+
+        // Status effects
+        for (var statusEffect : entity.getStatusEffects()) {
+            EntityAttributeModifier modifier = statusEffect.getEffectType().getAttributeModifiers().get(EntityAttributes.GENERIC_ATTACK_DAMAGE);
+            if (modifier == null) continue;
+            attributeInstance.addTemporaryModifier(new EntityAttributeModifier(modifier.getId(), statusEffect.getTranslationKey() + " " + statusEffect.getAmplifier(), statusEffect.getEffectType().adjustModifierAmount(statusEffect.getAmplifier(), modifier), modifier.getOperation()));
+        }
+
+        return attributeInstance;
+    }
+
+    /**
+     * @see LivingEntity#getAttributeValue(EntityAttribute)
+     */
+    public static double getAttributeValue(LivingEntity entity, EntityAttribute attribute) {
+        if (entity == mc.player) return entity.getAttributeValue(attribute);
+
+        return getAttributeInstance(entity, attribute).getValue();
+    }
+}

src/main/java/meteordevelopment/meteorclient/utils/entity/fakeplayer/FakePlayerEntity.java

@@ -6,6 +6,7 @@
 package meteordevelopment.meteorclient.utils.entity.fakeplayer;
 
 import com.mojang.authlib.GameProfile;
+import meteordevelopment.meteorclient.utils.entity.EntityAttributeManager;
 import net.minecraft.client.network.OtherClientPlayerEntity;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.entity.player.PlayerEntity;
@@ -33,7 +34,7 @@ public FakePlayerEntity(PlayerEntity player, String name, float health, boolean
         Byte playerModel = player.getDataTracker().get(PlayerEntity.PLAYER_MODEL_PARTS);
         dataTracker.set(PlayerEntity.PLAYER_MODEL_PARTS, playerModel);
 
-        getAttributes().setFrom(player.getAttributes());
+        getAttributes().setFrom(EntityAttributeManager.getAttributes(player));
         setPose(player.getPose());
 
         capeX = getX();

src/main/java/meteordevelopment/meteorclient/utils/player/PlayerUtils.java

@@ -191,16 +191,14 @@ public static double possibleHealthReductions(boolean entities, boolean fall) {
         if (entities) {
             for (Entity entity : mc.world.getEntities()) {
                 // Check for end crystals
-                if (entity instanceof EndCrystalEntity && damageTaken < DamageUtils.crystalDamage(mc.player, entity.getPos())) {
-                    damageTaken = DamageUtils.crystalDamage(mc.player, entity.getPos());
+                if (entity instanceof EndCrystalEntity) {
+                    double crystalDamage = DamageUtils.crystalDamage(mc.player, entity.getPos());
+                    if (crystalDamage > damageTaken) damageTaken = crystalDamage;
                 }
                 // Check for players holding swords
-                else if (entity instanceof PlayerEntity && damageTaken < DamageUtils.getSwordDamage((PlayerEntity) entity, true)) {
-                    if (!Friends.get().isFriend((PlayerEntity) entity) && isWithin(entity, 5)) {
-                        if (((PlayerEntity) entity).getActiveItem().getItem() instanceof SwordItem) {
-                            damageTaken = DamageUtils.getSwordDamage((PlayerEntity) entity, true);
-                        }
-                    }
+                else if (entity instanceof PlayerEntity player && !Friends.get().isFriend(player) && isWithin(entity, 5)) {
+                    double attackDamage = DamageUtils.getAttackDamage(player, mc.player);
+                    if (attackDamage > damageTaken) damageTaken = attackDamage;
                 }
             }
 
@@ -210,8 +208,9 @@ else if (entity instanceof PlayerEntity && damageTaken < DamageUtils.getSwordDam
                     BlockPos bp = blockEntity.getPos();
                     Vec3d pos = new Vec3d(bp.getX(), bp.getY(), bp.getZ());
 
-                    if (blockEntity instanceof BedBlockEntity && damageTaken < DamageUtils.bedDamage(mc.player, pos)) {
-                        damageTaken = DamageUtils.bedDamage(mc.player, pos);
+                    if (blockEntity instanceof BedBlockEntity) {
+                        double explosionDamage = DamageUtils.bedDamage(mc.player, pos);
+                        if (explosionDamage > damageTaken) damageTaken = explosionDamage;
                     }
                 }
             }

src/main/java/meteordevelopment/meteorclient/utils/world/BlockUtils.java

@@ -336,4 +336,42 @@ private static double getBlockBreakingSpeed(int slot, BlockState block) {
 
         return speed;
     }
+
+    /** {@link BlockPos.Mutable} mutations around an origin */
+
+    public static BlockPos.Mutable mutateAround(BlockPos.Mutable mutable, BlockPos origin, int xOffset, int yOffset, int zOffset) {
+        return mutable.set(origin.getX() + xOffset, origin.getY() + yOffset, origin.getZ() + zOffset);
+    }
+
+    public static BlockPos.Mutable mutateDown(BlockPos.Mutable mutable, BlockPos origin) {
+        return mutable.set(origin.getX(), origin.getY() - 1, origin.getZ());
+    }
+
+    public static BlockPos.Mutable mutateDown(BlockPos.Mutable mutable, BlockPos origin, int blocks) {
+        return mutable.set(origin.getX(), origin.getY() - blocks, origin.getZ());
+    }
+
+    public static BlockPos.Mutable mutateUp(BlockPos.Mutable mutable, BlockPos origin) {
+        return mutable.set(origin.getX(), origin.getY() + 1, origin.getZ());
+    }
+
+    public static BlockPos.Mutable mutateUp(BlockPos.Mutable mutable, BlockPos origin, int blocks) {
+        return mutable.set(origin.getX(), origin.getY() + blocks, origin.getZ());
+    }
+
+    public static BlockPos.Mutable mutateNorth(BlockPos.Mutable mutable, BlockPos origin) {
+        return mutable.set(origin.getX(), origin.getY(), origin.getZ() - 1);
+    }
+
+    public static BlockPos.Mutable mutateSouth(BlockPos.Mutable mutable, BlockPos origin) {
+        return mutable.set(origin.getX(), origin.getY(), origin.getZ() + 1);
+    }
+
+    public static BlockPos.Mutable mutateWest(BlockPos.Mutable mutable, BlockPos origin) {
+        return mutable.set(origin.getX() - 1, origin.getY(), origin.getZ());
+    }
+
+    public static BlockPos.Mutable mutateEast(BlockPos.Mutable mutable, BlockPos origin) {
+        return mutable.set(origin.getX() + 1, origin.getY(), origin.getZ());
+    }
 }