-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Some #farm
improvements
#4561
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.
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
Open
Avtera
wants to merge
7
commits into
cabaletta:1.21.1
Choose a base branch
from
Avtera:pr/1.21.1/farm/Improvements
base: 1.21.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Some #farm
improvements
#4561
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8d55fba
compensate for soulsand block height causing farm item pickup goal in…
Avtera 62302f9
add options to enable farm continuously
Avtera ada0c62
add option for farm to prioritize item gather
Avtera 95db4b4
fix some dumb mistake for farm continuously
Avtera 18597ab
improved the `#farmPrioritizeGather` to be goal composite
Avtera 71aa05c
improved the farm gather to respect the range from `#farm <range>`
Avtera 4848d05
Add crop whitelist to `#farm` (farming and pickup)
Avtera File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -981,6 +981,45 @@ public final class Settings { | |
*/ | ||
public final Setting<Integer> farmMaxScanSize = new Setting<>(256); | ||
|
||
/** | ||
* Prioritize pickup crop drops before another farm task | ||
*/ | ||
public final Setting<Boolean> farmPrioritizePickup = new Setting<>(false); | ||
|
||
/** | ||
* true = farm farm farm, i don't want to stop! | ||
* false = allow farm to stop or fail | ||
*/ | ||
public final Setting<Boolean> farmContinuously = new Setting<>(false); | ||
|
||
/** | ||
* How much farm task queue is enough for Baritone to resume the continuous farm? | ||
* {@link #farmContinuously} | ||
*/ | ||
public final Setting<Integer> farmContinuouslyThreshold = new Setting<>(16); | ||
|
||
/** | ||
* How long Baritone should wait (in seconds) to check if continuous farm threshold is fulfilled? | ||
* {@link #farmContinuously} | ||
*/ | ||
public final Setting<Long> farmContinuouslyIntervalSecs = new Setting<>(TimeUnit.MINUTES.toSeconds(2)); | ||
|
||
/** | ||
* Farm whitelist, only interact with crop that is on the {@link #farmWhitelist} list | ||
*/ | ||
public final Setting<Boolean> farmEnableWhitelist = new Setting<>(false); | ||
|
||
/** | ||
* Crop block that Baritone is allowed to farm and collect | ||
* {@link #farmEnableWhitelist} | ||
*/ | ||
|
||
public final Setting<List<Block>> farmWhitelist = new Setting<>(new ArrayList<>(Arrays.asList( | ||
Blocks.WHEAT, | ||
Blocks.POTATOES, | ||
Blocks.CARROTS | ||
))); | ||
|
||
/** | ||
* When the cache scan gives less blocks than the maximum threshold (but still above zero), scan the main world too. | ||
* <p> | ||
|
@@ -1397,7 +1436,7 @@ public final class Settings { | |
/** | ||
* Desktop notification on farm fail | ||
*/ | ||
public final Setting<Boolean> notificationOnFarmFail = new Setting<>(true); | ||
public final Setting<Boolean> notificationOnFarmProcess = new Setting<>(true); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why did you rename this? |
||
|
||
/** | ||
* Desktop notification on build finished | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The whitelist should default to allowing everything so
farmEnableWhitelist
is not needed.Also I'm not sure whether we really should use
Block
rather than a new enum type for farm targets.