Merge pull request #6 from N3ROO/MC_1.16.3_dev

Version 1.4.0

Author: lilgallon

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 1.4.0
+
+- Smart aim assistance: it will aim the closest part of a mob (instead of its neck) - (it's optimized)
+- "Stop when reached" option for mobs: if turned on, the mob aim assistance stops when you are looking at a mob
+
 ## Version 1.3.0
 
 - Support for the best controller mod - [Controllable](https://mrcrayfish.com/mods?id=controllable)

build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.3.0-MC1.16.x'
+version = '1.4.0-MC1.16.x'
 group = 'dev.nero.aimassistance' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'aimassistance'
 

src/main/java/dev/nero/aimassistance/config/ClientConfig.java

@@ -5,6 +5,7 @@
 
 public class ClientConfig {
 
+    public final ForgeConfigSpec.BooleanValue stopWhenReached;
     public final ForgeConfigSpec.DoubleValue aimForceMobs;
     public final ForgeConfigSpec.DoubleValue aimForceBlocks;
     public final ForgeConfigSpec.BooleanValue aimMobs;
@@ -14,6 +15,11 @@ public ClientConfig(ForgeConfigSpec.Builder builder) {
 
         builder.push("Aim assistance"); // Category
 
+        stopWhenReached = builder
+                .comment("If true, it will stop assisting once you're looking at a mob")
+                .translation(AimAssistanceMod.MOD_ID + ".config." + "stopWhenReached")
+                .define("stopWhenReached", false);
+
         aimForceMobs = builder
                 .comment("What should be the force of the aim assistance on mobs?")
                 .translation(AimAssistanceMod.MOD_ID + ".config." + "aimForceMobs")

src/main/java/dev/nero/aimassistance/config/Config.java

@@ -18,6 +18,7 @@ public class Config {
         CLIENT = specPair.getLeft();
     }
 
+    private static boolean stopWhenReached;
     private static double aimForceMobs;
     private static double aimForceBlocks;
     private static boolean aimMobs;
@@ -31,12 +32,17 @@ public static void onModConfigEvent(final ModConfig.ModConfigEvent configEvent)
     }
 
     public static void bakeConfig() {
+        stopWhenReached = CLIENT.stopWhenReached.get();
         aimForceMobs = CLIENT.aimForceMobs.get();
         aimForceBlocks = CLIENT.aimForceBlocks.get();
         aimMobs = CLIENT.aimMobs.get();
         aimBlocks = CLIENT.aimBlocks.get();
     }
 
+    public static boolean isStopWhenReached() {
+        return stopWhenReached;
+    }
+
     public static double getAimForceMobs() {
         return aimForceMobs;
     }

src/main/java/dev/nero/aimassistance/core/AimAssistance.java

@@ -222,6 +222,11 @@ public void assistIfPossible() {
                 }
             }
 
+            // Don't assist if the option to stop when reached is on AND if the player is currently aiming at a mob
+            if (this.interactingWith == TargetType.ENTITY) {
+                assist = !(Config.isStopWhenReached() && Wrapper.isPlayerAimingMob());
+            }
+
             if (assist) Wrapper.setRotations(rotations[0], rotations[1]);
         }
     }

src/main/java/dev/nero/aimassistance/utils/Wrapper.java

@@ -5,6 +5,7 @@
 import dev.nero.aimassistance.core.TargetType;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.MobEntity;
 import net.minecraft.util.math.*;
 import net.minecraft.util.math.vector.Vector3d;
 
@@ -103,6 +104,13 @@ private static BlockRayTraceResult rayTrace(double range) {
         );
     }
 
+    /**
+     * @return true if the player is currently aiming at a mob
+     */
+    public static boolean isPlayerAimingMob() {
+        return Wrapper.MC.pointedEntity instanceof MobEntity;
+    }
+
     /**
      * @param range in blocks, defines the range around the player to scan for entities
      * @param entityClass the entity type to look for (Check the Entity class: MobEntity.class for mobs for example)
@@ -131,7 +139,7 @@ public static Entity getClosestEntityToCrosshair(List<Entity> entities) {
 
         for(Entity entity : entities){
             // Get distance between the two entities (rotations)
-            float[] yawPitch = getYawPitchBetween(
+            float[] yawPitch = getClosestYawPitchBetween(
                     Wrapper.MC.player, entity
             );
 
@@ -154,22 +162,32 @@ public static Entity getClosestEntityToCrosshair(List<Entity> entities) {
      * @param source the source entity
      * @param target the target of the source entity
      */
-    public static float[] getYawPitchBetween(Entity source, Entity target) {
+    public static float[] getClosestYawPitchBetween(Entity source, Entity target) {
         // getPosY returns the ground position
         // getPosY + EyeHeight return the eye's position
         // getPosY + EyeHeight/1.5 returns the upper body position
-        final float SHIFT_FACTOR = 1.25f;
-
-        return Wrapper.getYawPitchBetween(
-                // source
-                source.getPosX(),
-                source.getPosY() + source.getEyeHeight(),
-                source.getPosZ(),
-                // target
-                target.getPosX(),
-                target.getPosY() + (target.getEyeHeight() / SHIFT_FACTOR),
-                target.getPosZ()
-        );
+        //final float SHIFT_FACTOR = 1.25f;
+
+        float[] bestYawPitch = new float[] { Float.MAX_VALUE, Float.MAX_VALUE };
+
+        for (float factor : new float[]{0f, 0.05f, 0.1f, 0.25f, 0.5f, 0.75f, 1.0f}) {
+            float[] yawPitch = Wrapper.getYawPitchBetween(
+                    // source
+                    source.getPosX(),
+                    source.getPosY() + source.getEyeHeight(),
+                    source.getPosZ(),
+                    // target
+                    target.getPosX(),
+                    target.getPosY() + target.getEyeHeight() * factor,
+                    target.getPosZ()
+            );
+
+            if (Math.abs(yawPitch[0]) + Math.abs(yawPitch[1]) < Math.abs(bestYawPitch[0]) + Math.abs(bestYawPitch[1])) {
+                bestYawPitch = yawPitch;
+            }
+        }
+
+        return bestYawPitch;
     }
 
     /**
@@ -206,7 +224,7 @@ public static float[] getRotationsNeeded(Target target, float fovX, float fovY,
         // We calculate the yaw/pitch difference between the target and the player
         float[] yawPitch;
         if (target.getType() == TargetType.ENTITY) {
-            yawPitch = getYawPitchBetween(
+            yawPitch = getClosestYawPitchBetween(
                     Wrapper.MC.player,
                     (Entity) target.getTarget()
             );

src/main/resources/META-INF/mods.toml

@@ -5,7 +5,7 @@ license="MIT License"
 
 [[mods]]
 modId="aimassistancemod"
-version="1.3.0"
+version="1.4.0"
 displayName="Aim Assistance"
 updateJSONURL="https://raw.githubusercontent.com/N3ROO/AimAssistanceMod/MC_1.16.3/update.json"
 displayURL="https://github.com/N3ROO/AimAssistanceMod/"

update.json

@@ -1,8 +1,8 @@
 {
   "homepage": "https://github.com/N3ROO/AimAssistanceMod/releases",
   "promos": {
-    "1.16.3-latest": "1.3.0",
-    "1.16.3-recommended": "1.3.0",
+    "1.16.3-latest": "1.4.0",
+    "1.16.3-recommended": "1.4.0",
     "1.15.2-latest": "1.2.0",
     "1.15.2-recommended": "1.2.0"
   }