Skip to content

dont close skymart between purchases #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2024
Merged

dont close skymart between purchases #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb149e5
dont close skymart between purchases
mqtze Oct 21, 2024
2d8c781
version
mqtze Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 7 additions & 6 deletions src/main/java/com/jelly/farmhelperv2/feature/impl/AutoRepellent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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")) {
Expand Down