Fix spears not working with Hitboxes

Issue came from the new AttackRangeComponent, which overrides the hitbox margin for weapons that have it (only spears by default)

Author: Wide-Cat

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

@@ -0,0 +1,27 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import meteordevelopment.meteorclient.systems.modules.Modules;
+import meteordevelopment.meteorclient.systems.modules.combat.Hitboxes;
+import net.minecraft.component.type.AttackRangeComponent;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.Vec3d;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.util.function.ToDoubleFunction;
+
+@Mixin(AttackRangeComponent.class)
+public class AttackRangeComponentMixin {
+    @ModifyExpressionValue(method = "isWithinRange(Lnet/minecraft/entity/LivingEntity;Ljava/util/function/ToDoubleFunction;D)Z", at = @At(value = "FIELD", target = "Lnet/minecraft/component/type/AttackRangeComponent;hitboxMargin:F", opcode = Opcodes.GETFIELD))
+    private float modifyHitboxMargin(float original, LivingEntity entity, ToDoubleFunction<Vec3d> squaredDistanceFunction, double extraHitboxMargin) {
+        float v = (float) Modules.get().get(Hitboxes.class).getEntityValue(entity);
+        return original + v;
+    }
+}

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

@@ -0,0 +1,30 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import meteordevelopment.meteorclient.systems.modules.Modules;
+import meteordevelopment.meteorclient.systems.modules.combat.Hitboxes;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.projectile.ProjectileUtil;
+import net.minecraft.util.math.Box;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ProjectileUtil.class)
+public class ProjectileUtilMixin {
+    @ModifyExpressionValue(
+        method = "collectPiercingCollisions(Lnet/minecraft/world/World;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Box;Ljava/util/function/Predicate;FLnet/minecraft/world/RaycastContext$ShapeType;Z)Ljava/util/Collection;",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getBoundingBox()Lnet/minecraft/util/math/Box;")
+    )
+    private static Box modifyHitboxMargin(Box original, @Local(ordinal = 1) Entity entity2) {
+        double v = Modules.get().get(Hitboxes.class).getEntityValue(entity2);
+        if (v == 0) return original;
+
+        return original.expand(v);
+    }
+}

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

@@ -98,6 +98,14 @@ public class Hitboxes extends Module {
         .build()
     );
 
+    private final Setting<Boolean> spear = sgWeapon.add(new BoolSetting.Builder()
+        .name("spear")
+        .description("Enable when holding a spear.")
+        .defaultValue(true)
+        .visible(onlyOnWeapon::get)
+        .build()
+    );
+
     public Hitboxes() {
         super(Categories.Combat, "hitboxes", "Expands an entity's hitboxes.");
     }
@@ -117,6 +125,7 @@ private boolean testWeapon() {
             if (shovel.get() && itemStack.isIn(ItemTags.SHOVELS)) return true;
             if (hoe.get() && itemStack.isIn(ItemTags.HOES)) return true;
             if (mace.get() && itemStack.getItem() instanceof MaceItem) return true;
+            if (spear.get() && itemStack.isIn(ItemTags.SPEARS)) return true;
             return false;
         });
     }

src/main/resources/meteor-client.mixins.json

@@ -16,6 +16,7 @@
     "AbstractSignEditScreenAccessor",
     "AbstractSignEditScreenMixin",
     "ArmorFeatureRendererMixin",
+    "AttackRangeComponentMixin",
     "BannerBlockEntityRendererMixin",
     "BeaconBlockEntityRendererMixin",
     "BeaconScreenMixin",
@@ -152,6 +153,7 @@
     "PlayerSkinProviderAccessor",
     "PowderSnowBlockMixin",
     "ProjectileInGroundAccessor",
+    "ProjectileUtilMixin",
     "ProjectionMatrix2Accessor",
     "RaycastContextMixin",
     "RegistriesMixin",