Skip to content

Commit

Permalink
Osama & RobotHanzo cooking
Browse files Browse the repository at this point in the history
Visitors Macro:
+ Added ability to use both name and rarity visitor filters at the same time, thanks RobotHanzo!
+ Added ability to choose whether to reject or ignore when the visitor isn't filtered by name filters, thanks RobotHanzo!

Remote Control:
= Fixed avatar previews, thanks RobotHanzo!

Webhook:
= Fixed spamming with JDA update messages

Jacob's Contest:
= Fixed next contest's crops not clearing from the memory when the player did not participate in the contest, thanks RobotHanzo!

Scheduler:
+ Added disconnecting during break, thanks Osama!
+ Added waiting until rewarp point is reached, thanks Osama!
+ Added ability to reset scheduler after disabling the macro, thanks Osama!
+ Added reset button, thanks Osama!

Jacob's Contest failsafe:
= Fixed reconnect bug, thanks Osama!

Lower Average BPS:
= Added stopping randomization
  • Loading branch information
onixiya1337 committed Jul 10, 2024
1 parent 089530c commit 03076b3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ mcVersion=1.8.9
modid=farmhelperv2
modName=FarmHelper
version=2.8.4-pre1
shouldRelease=false
shouldRelease=true
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ public void onTickDetection(TickEvent.ClientTickEvent event) {
|| currentBPS >= FarmHelperConfig.minBpsThreshold;

if (shouldReset) {
if (clock.isScheduled() || lowerBPSState != LowerBPSState.NONE) {
if (clock.isScheduled() || lowerBPSState == LowerBPSState.WAIT_BEFORE_START) {
resetStates();
// LogUtils.sendDebug("LowerAvgBpsFailsafe: Reset states. Current BPS: " + currentBPS);
}
return;
}

if (!clock.isScheduled()) {
clock.schedule(5000L);
clock.schedule(4500L + Math.random() * 1000L);
// LogUtils.sendDebug("LowerAvgBpsFailsafe: BPS below threshold. Current: " + currentBPS + ", Threshold: " + FarmHelperConfig.minBpsThreshold);
} else if (clock.passed()) {
// LogUtils.sendDebug("LowerAvgBpsFailsafe: Failsafe triggered. Current BPS: " + currentBPS);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void onTick(TickEvent.ClientTickEvent event) {
LogUtils.sendNotification("Farm Helper", "Farm Helper JDA Dependency is not installed, disabling remote control..");
}
return;
} else if (!FarmHelper.isJDAVersionCorrect) {
} else if (!FarmHelper.isJDAVersionCorrect && FarmHelperConfig.enableRemoteControl) {
FarmHelperConfig.enableRemoteControl = false;
LogUtils.sendError("[Remote Control] Farm Helper JDA Dependency is outdated! Please update it and try again. Disabling remote control...");
LogUtils.sendNotification("Farm Helper", "Farm Helper JDA Dependency is outdated! Please update it and try again. Disabling remote control...");
Expand Down

0 comments on commit 03076b3

Please sign in to comment.