0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't box doubles

Browse Source
This commit is contained in:
ZacSharp 2021-02-10 00:29:45 +01:00
parent fd61207709
commit ff068d374f
No known key found for this signature in database
GPG Key ID: 9453647B005083A3
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/java/baritone/api/pathing/goals/GoalNear.java
View File

@ -19,11 +19,10 @@ package baritone.api.pathing.goals;
import baritone.api.utils.SettingsUtil; import baritone.api.utils.SettingsUtil;
import baritone.api.utils.interfaces.IGoalRenderPos; import baritone.api.utils.interfaces.IGoalRenderPos;
import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
import it.unimi.dsi.fastutil.doubles.DoubleIterator;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.util.Collections;
import java.util.HashSet;
public class GoalNear implements Goal, IGoalRenderPos { public class GoalNear implements Goal, IGoalRenderPos {
private final int x; private final int x;
@ -57,7 +56,7 @@ public class GoalNear implements Goal, IGoalRenderPos {
@Override @Override
public double heuristic() {// TODO less hacky solution public double heuristic() {// TODO less hacky solution
int range = (int) Math.ceil(Math.sqrt(rangeSq)); int range = (int) Math.ceil(Math.sqrt(rangeSq));
HashSet<Double> maybeAlwaysInside = new HashSet<>(); DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet();
double minOutside = Double.POSITIVE_INFINITY; double minOutside = Double.POSITIVE_INFINITY;
for (int dx = -range; dx <= range; dx++) { for (int dx = -range; dx <= range; dx++) {
for (int dy = -range; dy <= range; dy++) { for (int dy = -range; dy <= range; dy++) {
@ -72,7 +71,9 @@ public class GoalNear implements Goal, IGoalRenderPos {
} }
} }
double maxInside = Double.NEGATIVE_INFINITY; double maxInside = Double.NEGATIVE_INFINITY;
for (double inside : maybeAlwaysInside) { DoubleIterator it = maybeAlwaysInside.iterator();
while(it.hasNext()) {
double inside = it.nextDouble();
if (inside < minOutside) { if (inside < minOutside) {
maxInside = Math.max(maxInside, inside); maxInside = Math.max(maxInside, inside);
} }

10
src/api/java/baritone/api/pathing/goals/GoalRunAway.java
View File

@ -18,11 +18,11 @@
package baritone.api.pathing.goals; package baritone.api.pathing.goals;
import baritone.api.utils.SettingsUtil; import baritone.api.utils.SettingsUtil;
import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
import it.unimi.dsi.fastutil.doubles.DoubleIterator;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
/** /**
* Useful for automated combat (retreating specifically) * Useful for automated combat (retreating specifically)
@ -99,7 +99,7 @@ public class GoalRunAway implements Goal {
maxY = Math.max(minY, p.getY() + distance); maxY = Math.max(minY, p.getY() + distance);
maxZ = Math.max(minZ, p.getZ() + distance); maxZ = Math.max(minZ, p.getZ() + distance);
} }
HashSet<Double> maybeAlwaysInside = new HashSet<>(); DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet();
double minOutside = Double.POSITIVE_INFINITY; double minOutside = Double.POSITIVE_INFINITY;
for (int x = minX; x <= maxX; x++) { for (int x = minX; x <= maxX; x++) {
for (int y = minY; y <= maxY; y++) { for (int y = minY; y <= maxY; y++) {
@ -114,7 +114,9 @@ public class GoalRunAway implements Goal {
} }
} }
double maxInside = Double.NEGATIVE_INFINITY; double maxInside = Double.NEGATIVE_INFINITY;
for (double inside : maybeAlwaysInside) { DoubleIterator it = maybeAlwaysInside.iterator();
while(it.hasNext()) {
double inside = it.nextDouble();
if (inside < minOutside) { if (inside < minOutside) {
maxInside = Math.max(maxInside, inside); maxInside = Math.max(maxInside, inside);
} }