= Visitors Tweaks

JellyLabScripts · Apr 14, 2024 · c139a3f · c139a3f
1 parent 8e11c4d
commit c139a3f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.5.18
+version=2.5.19
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java
@@ -711,7 +711,7 @@ private void onVisitorsState() {
                 }
                 LogUtils.sendDebug("Position of visitor: " + result.entityCharacter.getPositionEyes(1));
                 if (mc.thePlayer.getDistanceToEntity(result.entityCharacter) > 3) {
-                    Vec3 closestVec = PlayerUtils.getClosestVecAround(result.entityCharacter, 1.35, 45, 0);
+                    Vec3 closestVec = PlayerUtils.getClosestVecAround(result.entityCharacter, 1.25, 90, 45);
                     if (closestVec == null) {
                         LogUtils.sendError("[Visitors Macro] Couldn't find a position to get closer");
                         stop();
@@ -1054,7 +1054,7 @@ private void onVisitorsState() {
                 }
                 LogUtils.sendDebug("Position of visitor: " + currentCharacter.get().getPositionEyes(1));
                 if (mc.thePlayer.getDistanceToEntity(currentCharacter.get()) > 3) {
-                    Vec3 closestVec = PlayerUtils.getClosestVecAround(currentCharacter.get(), 1.35, 45, 0);
+                    Vec3 closestVec = PlayerUtils.getClosestVecAround(currentCharacter.get(), 1.25, 90, 45);
                     if (closestVec == null) {
                         LogUtils.sendError("[Visitors Macro] Couldn't find a position to get closer");
                         stop();

diff --git a/src/main/java/com/jelly/farmhelperv2/util/PlayerUtils.java b/src/main/java/com/jelly/farmhelperv2/util/PlayerUtils.java
@@ -368,12 +368,12 @@ public static Vec3 getClosestVecAround(Entity entity, double distance) {
     }
 
     public static Vec3 getClosestVecAround(Entity entity, double distance, int angleStep, int angleStart) {
-        Vec3 vec = new Vec3(entity.posX, entity.posY, entity.posZ);
         Vec3 closest = null;
-        for (int i = angleStart; i < 360; i += angleStep) {
-            Vec3 vec1 = vec.addVector(Math.sin(Math.toRadians(i)) * distance, 0, Math.cos(Math.toRadians(i)) * distance);
-            System.out.println(vec1);
-            if ((closest == null || vec1.distanceTo(entity.getPositionVector()) < closest.distanceTo(entity.getPositionVector())) && !BlockUtils.hasCollision(new BlockPos(vec1))) {
+        for (int i = angleStart; i <= 360; i += angleStep) {
+            double x = entity.posX + distance * Math.cos(Math.toRadians(i));
+            double z = entity.posZ + distance * Math.sin(Math.toRadians(i));
+            Vec3 vec1 = new Vec3(x, entity.posY + 0.6, z);
+            if ((closest == null || vec1.distanceTo(mc.thePlayer.getPositionVector()) < closest.distanceTo(mc.thePlayer.getPositionVector())) && !BlockUtils.hasCollision(new BlockPos(vec1))) {
                 closest = vec1;
             }
         }