Merge pull request #2 from AhmedMahmud/master

Fixed issues with player getting stuck at start of farm

Author: Jelly298

src/main/java/FarmHelper/FarmHelper.java

@@ -42,7 +42,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
 @Mod(modid = FarmHelper.MODID, name = FarmHelper.NAME, version = FarmHelper.VERSION)
 public class FarmHelper
 {
@@ -209,7 +208,7 @@ public void render(RenderGameOverlayEvent event)
                 Utils.drawString("profit/h = " + moneyper10sec * 6 * 60, 6, 104, 0.8f, -1);
             }
 
-            mc.fontRendererObj.drawString(  Utils.getFrontBlock()+ " " + Utils.getBackBlock().toString(), 4, new ScaledResolution(mc).getScaledHeight() - 20, -1);
+            mc.fontRendererObj.drawString(Utils.getFrontBlock() + " " + Utils.getBackBlock().toString() + " " + Utils.getRightBlock().toString() + " " + Utils.getLeftBlock().toString(), 4, new ScaledResolution(mc).getScaledHeight() - 20, -1);
 
 
         }
@@ -300,15 +299,22 @@ public void OnTickPlayer(TickEvent.ClientTickEvent event) { //Client -> player
                         KeyBinding.setKeyBindState(keybindD, true);
                         Thread.sleep(300);
                         KeyBinding.setKeyBindState(keybindD, false);
+                        Thread.sleep(300);
+
                         if(Config.FarmType == FarmEnum.LAYERED){
                             if(isWalkable(Utils.getFrontBlock())) {
                                 initialX = (int)mc.thePlayer.posX;
                                 initialZ = (int)mc.thePlayer.posZ;
                                 process3 = true;
                             }
+                            Utils.debugLog(mc.thePlayer, "Checking if stuck at start");
+                            if (!isWalkable(Utils.getFrontBlock()) && !isWalkable(Utils.getBackBlock()) && !isWalkable(Utils.getRightBlock()) && isWalkable(Utils.getLeftBlock())) {
+                                Utils.debugLog(mc.thePlayer, "Stuck at start of farm, changing direction");
+                                ExecuteRunnable(changeMotion);
+                                Utils.debugLog(mc.thePlayer, "Changed direction");
+                            }
                         }
                         ExecuteRunnable(stopAntistuck);
-
                         //exec
                     }catch(Exception e){
                         e.printStackTrace();
@@ -509,6 +515,7 @@ public void run() {
         }
     };
 
+
     Runnable changeLayer = () -> {
         if(!notInIsland && !emergency) {
             try {
@@ -521,17 +528,27 @@ public void run() {
                 Utils.smoothRotateClockwise(180);
                 Thread.sleep(2000);
                 rotating = false;
+
+                // After 180 you are at back of trench, hold W for some time to go to front
+                KeyBinding.setKeyBindState(keybindW, true);
+                Thread.sleep(500);
+                KeyBinding.setKeyBindState(keybindW, false);
+
                 enabled = true;
             }catch(Exception e){
                 e.printStackTrace();
             }
+
         }
     };
 
     Runnable changeMotion = () -> {
+        Utils.debugLog(mc.thePlayer, "Trying to change motion");
         if(!notInIsland && !emergency) {
             process1 = !process1;
             process2 = !process2;
+            Utils.debugLog(mc.thePlayer, "1:" + process1 + ", 2: " + process2 + ", 3: " + process3 + ", 4: " + process4);
+            Utils.debugLog(mc.thePlayer, "Motion function: changed");
             set = false;
         }
     };
@@ -736,13 +753,17 @@ void clickWindow(int windowID, int slotID, int mouseButtonClicked, int mode) thr
         }
     }
     void initialize(){
+         Utils.debugLog(mc.thePlayer, "Initializing");
         deltaX = 10000;
         deltaZ = 10000;
         deltaY = 0;
 
-
         process1 = true;
         process2 = false;
+        if (!isWalkable(Utils.getFrontBlock()) && !isWalkable(Utils.getBackBlock()) && !isWalkable(Utils.getRightBlock()) && isWalkable(Utils.getLeftBlock())) {
+            process1 = false;
+            process2 = true;
+        }
         process3 = false;
         process4 = false;
         if(Config.FarmType == FarmEnum.LAYERED){
@@ -751,7 +772,6 @@ void initialize(){
             }
         }
 
-
         setspawned = false;
         shdBePressingKey = true;
         notInIsland = false;

src/main/java/FarmHelper/utils/Utils.java

@@ -3,10 +3,13 @@
 import FarmHelper.config.Config;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.inventory.Slot;
 import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
 
 import java.util.Random;
 
@@ -203,6 +206,22 @@ public static Block getBackBlock(){
                 new BlockPos(mc.thePlayer.getLookVec().xCoord * -1 + mc.thePlayer.posX, mc.thePlayer.posY,
                         mc.thePlayer.getLookVec().zCoord * -1 + mc.thePlayer.posZ)).getBlock());
     }
-
-
+    public static Block getRightBlock(){
+        Minecraft mc = Minecraft.getMinecraft();
+        return (mc.theWorld.getBlockState(
+          new BlockPos(mc.thePlayer.getLookVec().zCoord * -1 + mc.thePlayer.posX, mc.thePlayer.posY,
+            mc.thePlayer.getLookVec().xCoord + mc.thePlayer.posZ)).getBlock());
+    }
+    public static Block getLeftBlock(){
+        Minecraft mc = Minecraft.getMinecraft();
+        return (mc.theWorld.getBlockState(
+          new BlockPos(mc.thePlayer.getLookVec().zCoord + mc.thePlayer.posX, mc.thePlayer.posY,
+            mc.thePlayer.getLookVec().xCoord * -1 + mc.thePlayer.posZ)).getBlock());
+    }
+    public static void debugLog(EntityPlayerSP player, String message) {
+        if (false) {
+            player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN +
+              "[Debug]: " + EnumChatFormatting.DARK_GREEN + message));
+        }
+    }
 }