diff options
| author | DoKM <54663875+DoKM@users.noreply.github.com> | 2021-08-20 20:49:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 20:49:41 +0200 |
| commit | 9bdf107725ec331d0acb24a53ad3708547bfdb06 (patch) | |
| tree | 3999215700cec982da78456803e815dfb8e7c590 /src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java | |
| parent | 45005ca693c7b43ff7eedd509b0b4a784cedd9f1 (diff) | |
| parent | 9ae27a4748cce4713d7cdd3ac56776387be04b52 (diff) | |
| download | notenoughupdates-9bdf107725ec331d0acb24a53ad3708547bfdb06.tar.gz notenoughupdates-9bdf107725ec331d0acb24a53ad3708547bfdb06.tar.bz2 notenoughupdates-9bdf107725ec331d0acb24a53ad3708547bfdb06.zip | |
Merge pull request #21 from DeDiamondPro/master
bug fixes
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java index c6ad2ef1..357d8326 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java @@ -34,9 +34,8 @@ public class CrystalMetalDetectorSolver { y, Math.floor(mc.thePlayer.posZ) + zOffset); BlockPos above = new BlockPos(Math.floor(mc.thePlayer.posX) + xOffset, y + 1, Math.floor(mc.thePlayer.posZ) + zOffset); - xOffset++; - calculatedDist = getPlayerPos().distanceTo(new Vec3(pos).addVector(0D,1D,0D)); - if (inRange(calculatedDist, dist) && treasureAllowed(pos) && !possibleBlocks.contains(pos) && + calculatedDist = getPlayerPos().distanceTo(new Vec3(pos).addVector(0D, 1D, 0D)); + if (round(calculatedDist, 1) == dist && treasureAllowed(pos) && !possibleBlocks.contains(pos) && mc.theWorld.getBlockState(above).getBlock().getRegistryName().equals("minecraft:air")) { possibleBlocks.add(pos); } @@ -49,8 +48,8 @@ public class CrystalMetalDetectorSolver { y, Math.floor(mc.thePlayer.posZ) + zOffset); BlockPos above = new BlockPos(Math.floor(mc.thePlayer.posX) - xOffset, y + 1, Math.floor(mc.thePlayer.posZ) + zOffset); - calculatedDist = getPlayerPos().distanceTo(new Vec3(pos).addVector(0D,1D,0D)); - if (inRange(calculatedDist, dist) && treasureAllowed(pos) && !possibleBlocks.contains(pos) && + calculatedDist = getPlayerPos().distanceTo(new Vec3(pos).addVector(0D, 1D, 0D)); + if (round(calculatedDist, 1) == dist && treasureAllowed(pos) && !possibleBlocks.contains(pos) && mc.theWorld.getBlockState(above).getBlock().getRegistryName().equals("minecraft:air")) { possibleBlocks.add(pos); } @@ -63,18 +62,10 @@ public class CrystalMetalDetectorSolver { locations.add(mc.thePlayer.getPosition()); List<BlockPos> temp = new ArrayList<>(); for (BlockPos pos : possibleBlocks) { - if (round(getPlayerPos().distanceTo(new Vec3(pos).addVector(0D,1D,0D)), 1) - == dist) { + if (round(getPlayerPos().distanceTo(new Vec3(pos).addVector(0D, 1D, 0D)), 1) == dist) { temp.add(pos); } } - if (temp.size() == 0) { - for (BlockPos pos : possibleBlocks) { - if (inRange(getPlayerPos().distanceTo(new Vec3(pos).addVector(0D,1D,0D)), dist)) { - temp.add(pos); - } - } - } possibleBlocks = temp; sendMessage(); } @@ -128,11 +119,6 @@ public class CrystalMetalDetectorSolver { } } - - private static boolean inRange(double number, double dist) { - return dist + 0.1D >= number && dist - 0.1D <= number; - } - private static Vec3 getPlayerPos() { return new Vec3(mc.thePlayer.posX, mc.thePlayer.posY + (mc.thePlayer.getEyeHeight() - mc.thePlayer.getDefaultEyeHeight()), mc.thePlayer.posZ); } |