From eb149e52fa6760f1b47e84a9ae2b044395081aba Mon Sep 17 00:00:00 2001 From: mqtze Date: Mon, 21 Oct 2024 17:16:33 +0200 Subject: [PATCH 1/2] dont close skymart between purchases --- .../farmhelperv2/feature/impl/AutoRepellent.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoRepellent.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoRepellent.java index 82159be4d..080db0f7e 100644 --- a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoRepellent.java +++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoRepellent.java @@ -203,12 +203,9 @@ public void onTickExecution(TickEvent.ClientTickEvent event) { if (InventoryUtils.hasItemInHotbar(!FarmHelperConfig.pestRepellentType ? "Pest Repellent" : "Pest Repellent MAX")) { LogUtils.sendDebug("Repellent in hotbar, selecting repellent"); state = State.SELECT_REPELLENT; - } else if (InventoryUtils.hasItemInInventory(!FarmHelperConfig.pestRepellentType ? "Pest Repellent" : "Pest Repellent MAX")){ + } else { LogUtils.sendDebug("Repellent not in hotbar, moving to hotbar"); state = State.MOVE_REPELLENT; - } else { - LogUtils.sendDebug("Repellent not in inventory, buying"); - state = State.NONE; } delayClock.schedule(FarmHelperConfig.getRandomGUIMacroDelay()); break; @@ -399,7 +396,6 @@ public void onDrawGui(DrawScreenAfterEvent event) { if (confirmSlot == null) { break; } - state = State.FIND_REPELLENT_IN_INVENTORY; InventoryUtils.clickContainerSlot(confirmSlot.slotNumber, InventoryUtils.ClickType.LEFT, InventoryUtils.ClickMode.PICKUP); delayClock.schedule(FarmHelperConfig.getRandomGUIMacroDelay()); break; @@ -413,8 +409,13 @@ public void onChatReceived(ClientChatReceivedEvent event) { String message = StringUtils.stripControlCodes(event.message.getUnformattedText()); // just to be sure lol if (isRunning() && state == State.CONFIRM_BUY) { if (message.startsWith("You bought Pest")) { - state = State.FIND_REPELLENT_IN_INVENTORY; + if(FarmHelperConfig.pestRepellentType && !message.contains("MAX")){ + state = State.CLICK_REPELLENT; + } else { + state = State.FIND_REPELLENT_IN_INVENTORY; + } delayClock.schedule(FarmHelperConfig.getRandomGUIMacroDelay()); + return; } } if (message.startsWith("YUM! Pests will now spawn")) { From 2d8c781746116cbfdf1e7646c20bd89ee7332804 Mon Sep 17 00:00:00 2001 From: mqtze Date: Thu, 24 Oct 2024 15:58:44 +0200 Subject: [PATCH 2/2] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f31384ebf..8a660251a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2 mcVersion=1.8.9 modid=farmhelperv2 modName=FarmHelper -version=2.8.10 +version=2.8.11 shouldRelease=true