From 82629090639ee9011126b9055b79bf420de4c35f Mon Sep 17 00:00:00 2001 From: kuthy Date: Fri, 3 Jul 2020 15:36:44 +0200 Subject: [PATCH 1/3] Fixing crash after clicking into the air --- src/main/java/baritone/utils/GuiClick.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index 4f89100dc..2f77714cf 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -93,10 +93,16 @@ public class GuiClick extends GuiScreen { Helper.HELPER.logDirect(component); clickStart = null; } else { - BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalTwoBlocks(currentMouseOver)); + if(currentMouseOver != null)//Catch this, or else a click into void will result in a crash + BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver)); + else + Helper.HELPER.logDirect("Sorry, I can't go to nothing"); } } else if (mouseButton == 1) { - BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver.up())); + if(currentMouseOver != null) + BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver.up())); + else + Helper.HELPER.logDirect("Sorry, I can't go to nothing"); } clickStart = null; } From 0055a059f71be48d68d6ad92aaad1712dee3be7a Mon Sep 17 00:00:00 2001 From: kuthy Date: Fri, 3 Jul 2020 16:52:03 +0200 Subject: [PATCH 2/3] Formated Code --- src/main/java/baritone/utils/GuiClick.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index 2f77714cf..00be0635a 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -20,7 +20,6 @@ package baritone.utils; import baritone.Baritone; import baritone.api.BaritoneAPI; import baritone.api.pathing.goals.GoalBlock; -import baritone.api.pathing.goals.GoalTwoBlocks; import baritone.api.utils.BetterBlockPos; import baritone.api.utils.Helper; import net.minecraft.client.gui.GuiScreen; @@ -43,8 +42,8 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.util.Collections; -import static org.lwjgl.opengl.GL11.*; import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; +import static org.lwjgl.opengl.GL11.*; public class GuiClick extends GuiScreen { @@ -93,13 +92,13 @@ public class GuiClick extends GuiScreen { Helper.HELPER.logDirect(component); clickStart = null; } else { - if(currentMouseOver != null)//Catch this, or else a click into void will result in a crash + if (currentMouseOver != null)//Catch this, or else a click into void will result in a crash BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver)); else Helper.HELPER.logDirect("Sorry, I can't go to nothing"); } } else if (mouseButton == 1) { - if(currentMouseOver != null) + if (currentMouseOver != null) BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver.up())); else Helper.HELPER.logDirect("Sorry, I can't go to nothing"); From 7f9704592e1aa4765351d1c17637fef840867fa5 Mon Sep 17 00:00:00 2001 From: kuthy Date: Tue, 18 Aug 2020 15:40:12 +0200 Subject: [PATCH 3/3] Made catch function wide --- src/main/java/baritone/utils/GuiClick.java | 40 ++++++++++------------ 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index 00be0635a..1716d74b6 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -78,30 +78,26 @@ public class GuiClick extends GuiScreen { @Override protected void mouseReleased(int mouseX, int mouseY, int mouseButton) { - if (mouseButton == 0) { - if (clickStart != null && !clickStart.equals(currentMouseOver)) { - BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().removeAllSelections(); - BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().addSelection(BetterBlockPos.from(clickStart), BetterBlockPos.from(currentMouseOver)); - ITextComponent component = new TextComponentString("Selection made! For usage: " + Baritone.settings().prefix.value + "help sel"); - component.getStyle() - .setColor(TextFormatting.WHITE) - .setClickEvent(new ClickEvent( - ClickEvent.Action.RUN_COMMAND, - FORCE_COMMAND_PREFIX + "help sel" - )); - Helper.HELPER.logDirect(component); - clickStart = null; - } else { - if (currentMouseOver != null)//Catch this, or else a click into void will result in a crash + if (currentMouseOver != null) { //Catch this, or else a click into void will result in a crash + if (mouseButton == 0) { + if (clickStart != null && !clickStart.equals(currentMouseOver)) { + BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().removeAllSelections(); + BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().addSelection(BetterBlockPos.from(clickStart), BetterBlockPos.from(currentMouseOver)); + ITextComponent component = new TextComponentString("Selection made! For usage: " + Baritone.settings().prefix.value + "help sel"); + component.getStyle() + .setColor(TextFormatting.WHITE) + .setClickEvent(new ClickEvent( + ClickEvent.Action.RUN_COMMAND, + FORCE_COMMAND_PREFIX + "help sel" + )); + Helper.HELPER.logDirect(component); + clickStart = null; + } else { BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver)); - else - Helper.HELPER.logDirect("Sorry, I can't go to nothing"); - } - } else if (mouseButton == 1) { - if (currentMouseOver != null) + } + } else if (mouseButton == 1) { BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver.up())); - else - Helper.HELPER.logDirect("Sorry, I can't go to nothing"); + } } clickStart = null; }