= Dirt Check - Another fixes for false detections (issues with water …

…when lagging)
JellyLabScripts · Jan 13, 2024 · 58bb923 · 58bb923
1 parent 0c08194
commit 58bb923
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 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.4.1-pre11
+version=2.4.1-pre12
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/impl/DirtFailsafe.java b/src/main/java/com/jelly/farmhelperv2/failsafe/impl/DirtFailsafe.java
@@ -16,6 +16,7 @@
 import com.jelly.farmhelperv2.util.helper.RotationConfiguration;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
+import net.minecraft.util.Tuple;
 import net.minecraft.util.Vec3;
 
 import java.util.ArrayList;
@@ -63,16 +64,14 @@ public boolean shouldAltTab() {
     @Override
     public void onBlockChange(BlockChangeEvent event) {
         if (FailsafeManager.getInstance().firstCheckReturn()) return;
-        if ((!event.old.getBlock().equals(Blocks.air) && !CropUtils.isCrop(event.old.getBlock())) ||
-                event.update.getBlock() == null ||
-                event.update.getBlock().equals(Blocks.air) ||
-                CropUtils.isCrop(event.update.getBlock()) ||
-                !event.update.getBlock().isCollidable() ||
-                event.update.getBlock().equals(Blocks.trapdoor))
-            return;
-
-        LogUtils.sendWarning("[Failsafe] Someone put a block on your garden! Block pos: " + event.pos);
-        dirtBlocks.add(event.pos);
+        if ((event.old.getBlock().equals(Blocks.air) || CropUtils.isCrop(event.old.getBlock()) || event.old.getBlock().equals(Blocks.water) || event.old.getBlock().equals(Blocks.flowing_water)) &&
+                event.update.getBlock() != null && !event.update.getBlock().equals(Blocks.air) &&
+                !CropUtils.isCrop(event.update.getBlock()) && event.update.getBlock().isCollidable() &&
+                !event.update.getBlock().equals(Blocks.trapdoor) && !event.update.getBlock().equals(Blocks.water) &&
+                !event.update.getBlock().equals(Blocks.flowing_water)) { // If old block was air or crop and new block is not air, crop, trapdoor, water or flowing water
+            LogUtils.sendWarning("[Failsafe] Someone put a block on your garden! Block pos: " + event.pos);
+            dirtBlocks.add(new Tuple<>(event.pos, System.currentTimeMillis()));
+        }
     }
 
     @Override
@@ -143,7 +142,13 @@ else if (BlockUtils.getRelativeBlock(1, 1, 0).equals(Blocks.dirt))
                     break;
                 if (FailsafeManager.getInstance().swapItemDuringRecording && Math.random() > 0.6)
                     FailsafeManager.getInstance().swapItemDuringRecording = false;
-                dirtBlocks.removeIf(blockPos -> !mc.theWorld.getBlockState(blockPos).getBlock().equals(Blocks.dirt));
+                dirtBlocks.removeIf(tuple -> {
+                    if (System.currentTimeMillis() - tuple.getSecond() > 120_000 || !mc.theWorld.getBlockState(tuple.getFirst()).getBlock().isCollidable() || BlockUtils.canWalkThrough(tuple.getFirst())) {
+                        LogUtils.sendDebug("[Failsafe] Dirt block removed: " + tuple.getFirst());
+                        return true;
+                    }
+                    return false;
+                });
                 if (dirtBlocks.isEmpty()) {
                     LogUtils.sendDebug("No dirt blocks left!");
                     dirtCheckState = DirtCheckState.GO_BACK_START;
@@ -231,7 +236,8 @@ public void resetStates() {
     }
 
     public boolean isTouchingDirtBlock() {
-        for (BlockPos dirtBlock : dirtBlocks) {
+        for (Tuple<BlockPos, Long> tuple : dirtBlocks) {
+            BlockPos dirtBlock = tuple.getFirst();
             double distance = Math.sqrt(mc.thePlayer.getPositionEyes(1).distanceTo(new Vec3(dirtBlock.getX() + 0.5, dirtBlock.getY() + 0.5, dirtBlock.getZ() + 0.5)));
             LogUtils.sendDebug(distance + " " + dirtBlock);
             if (distance <= 1.5) {
@@ -245,7 +251,7 @@ public boolean hasDirtBlocks() {
         return !dirtBlocks.isEmpty();
     }
 
-    private final ArrayList<BlockPos> dirtBlocks = new ArrayList<>();
+    private final ArrayList<Tuple<BlockPos, Long>> dirtBlocks = new ArrayList<>();
     private BlockPos positionBeforeReacting = null;
     private Rotation rotationBeforeReacting = null;
     private boolean dirtOnLeft = false;