Skip to content

Commit

Permalink
AutoSell:
Browse files Browse the repository at this point in the history
 = Tweak

Visitors Macro:
 - Removed non pathfinder mode
 = Tweaks and fixes

PDOTT:
 + Going to wait 0.5s before disabling itself, makes it a little more smooth

Melon/Pumpkin Default Macro:
 + Going to stop movement in switch lane if stopped by a wall
  • Loading branch information
May2Beez committed Apr 20, 2024
1 parent 5c3307d commit 956112a
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 192 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
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.5.24
version=2.5.25
shouldRelease=true
Original file line number Diff line number Diff line change
Expand Up @@ -947,12 +947,6 @@ else if (testFailsafeTypeSelected != 6)
)
public static boolean pauseVisitorsMacroDuringJacobsContest = true;

@Switch(
name = "Use Path finder in Visitors macro between serving visitors (recommended for higher speeds)", category = VISITORS_MACRO, subcategory = "Visitors Macro",
description = "Uses path finder between serving visitors"
)
public static boolean visitorsMacroUsePathFinder = true;

@Slider(
name = "The minimum amount of coins to start the macro (in thousands)", category = VISITORS_MACRO, subcategory = "Visitors Macro",
description = "The minimum amount of coins you need to have in your purse to start the visitors macro",
Expand Down Expand Up @@ -1993,7 +1987,6 @@ public FarmHelperConfig() {
this.addDependency("jacobFailsafeAction", "enableJacobFailsafes");

this.addDependency("pauseVisitorsMacroDuringJacobsContest", "visitorsMacro");
this.addDependency("visitorsMacroUsePathFinder", "visitorsMacro");
this.addDependency("triggerVisitorsMacro", "visitorsMacro");
this.addDependency("visitorsMacroPriceManipulationMultiplier", "visitorsMacro");
this.addDependency("visitorsMacroMinVisitors", "visitorsMacro");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ public void onTickEnabled(TickEvent.ClientTickEvent event) {
switch (bazaarState) {
case NONE:
setBazaarState(BazaarState.OPEN_MENU);
delayClock.schedule(1_000);
break;
case OPEN_MENU:
if (mc.currentScreen == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public void stop() {
}
delayStart.reset();
stuckTimer.reset();
noPestTimer.reset();
}

@Override
Expand Down Expand Up @@ -135,6 +136,8 @@ public void onTickShouldEnable(TickEvent.PlayerTickEvent event) {
}
}

private final Clock noPestTimer = new Clock();

@SubscribeEvent
public void onTickExecution(TickEvent.PlayerTickEvent event) {
if (mc.thePlayer == null) return;
Expand All @@ -160,6 +163,7 @@ public void onTickExecution(TickEvent.PlayerTickEvent event) {
currentTarget = entity.get();
stuckTimer.schedule(FarmHelperConfig.pestsDestroyerOnTheTrackStuckTimer);
}
noPestTimer.reset();
KeyBindUtils.holdThese(mc.gameSettings.keyBindUseItem);
if (!RotationHandler.getInstance().isRotating()) {
RotationHandler.getInstance().easeTo(
Expand All @@ -171,7 +175,13 @@ public void onTickExecution(TickEvent.PlayerTickEvent event) {
);
}
} else {
stop();
if (!noPestTimer.isScheduled()) {
noPestTimer.schedule(500);
}
if (noPestTimer.isScheduled() && noPestTimer.passed()) {
LogUtils.sendWarning("[" + getName() + "] Pest left your range, stopping!");
stop();
}
}
}

Expand Down
Loading

0 comments on commit 956112a

Please sign in to comment.