Garden Tweaks & Features #1118

WannaBeIan · 2024-12-31T08:59:34Z

Added an option to view required crops in the visitor helper as stacks + remainder.
Visitor Helper now works outside of the Garden by default but includes a new setting to lock it to the Garden.
Fixed the regex for Farming XP so it works correctly and now displays your XP/h, even at max farming level.
Added decimals for more precise XP/h and Blocks/s calculations.
Visitors requesting the same crops are grouped together, displaying a sum of the required crops.

I am aware the code is pretty messy its been some time since I've sat down and type something up

Let me know if anything needs to be fixed, and I'll take care of it!

…ecision for XP/h and Blocks/s

src/main/java/de/hysky/skyblocker/config/configs/FarmingConfig.java

src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java

src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java

src/main/resources/assets/skyblocker/lang/en_us.json

kevinthegreat1 · 2025-01-02T09:36:18Z

After a discussion, we think the visitor helper options would be better in a group. If you can also do that it’d be great.

WannaBeIan · 2025-01-06T03:52:41Z

Sorry for the messy commits. this should be everything requested change wise.

VisitorHelper is now it's own group and work's/looks really good.
Added a "Vacuum Solver" which just makes a guess based on the angry_witch partcles and places a waypoint at the location
Added "Pest Highlighter" which applies a glow effect on pests.
Made a little change in MayorUtils causing an error when no minister is found.
Made the changes requested in the Farming hud, and when you're at max farming rather than it showing xp/0 I have farmingXpPercentProgress clamped between 0/100
Noticed while going through the config that the description of suppliesAndFuelWaypointType was using an old translation so I updated that as well

src/main/java/de/hysky/skyblocker/utils/mayor/MayorUtils.java

WannaBeIan · 2025-01-06T05:41:32Z

The VacuumSolver could be improved by checking the scoreboard location line for the pest icon before rendering the waypoint, instead of rendering it regardless of pests. This can be addressed in a future PR.

… method during some tests

kevinthegreat1

LGTM. I've made some clean up and fixes if you want to take a look.

kevinthegreat1 · 2025-02-12T17:16:50Z

src/main/java/de/hysky/skyblocker/skyblock/garden/visitorhelper/Visitor.java

+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		Visitor visitor = (Visitor) o;
+		return Objects.equals(name, visitor.name) &&
+				ItemStack.areEqual(head, visitor.head) &&
+				Objects.equals(requiredItems, visitor.requiredItems);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name, head, requiredItems);
+	}


Are these methods used? Two visitors may be equal when ItemStack::areEqual but have different hash codes.

kevinthegreat1 · 2025-02-12T17:27:52Z

src/main/java/de/hysky/skyblocker/skyblock/garden/VacuumSolver.java

+		}
+
+		if (linkedMarkers.isEmpty() && fixedDestination != null) {
+			RenderHelper.renderFilled(context, new BlockPos(


Line 111 and 124 are the same? I've pushed a fix.

kevinthegreat1 · 2025-02-12T21:52:22Z

src/main/java/de/hysky/skyblocker/skyblock/garden/visitorhelper/VisitorHelper.java

+		ItemUtils.getLore(acceptButton).stream()
+				.map(Text::getString)
+				.map(String::trim)
+				.filter(lore -> !lore.isEmpty() && !lore.contains("Rewards"))


filter doesn't work this way. This still matches lines after the rewards line. I've gone ahead and used takeWhile.

src/main/java/de/hysky/skyblocker/config/configs/FarmingConfig.java

AzureAaron · 2025-02-12T23:10:30Z

src/main/java/de/hysky/skyblocker/skyblock/garden/VacuumSolver.java

+		WorldRenderEvents.AFTER_TRANSLUCENT.register(VacuumSolver::renderTrail);
+	}
+
+	private static void reset() {


Shouldn't this reset the destination too?

I tried to use this solver but couldn't figure it out so @WannaBeIan.

Like I mentioned the code for the Vacuum Solver is really bad I mean it "kinda" worked it would get the particles and find where they end but it wouldn't estimate where the pest was I looked at some code from skyhanni as reference and that's where I got with it.

src/main/java/de/hysky/skyblocker/skyblock/garden/visitor/Visitor.java

src/main/java/de/hysky/skyblocker/skyblock/garden/visitor/VisitorHelper.java

AzureAaron · 2025-02-12T23:15:39Z

src/main/java/de/hysky/skyblocker/skyblock/garden/VacuumSolver.java

+	}
+
+	private static void renderTrail(WorldRenderContext context) {
+		if (fixedDestination == null) {


Maybe also check if the person is in the garden and stuff?

kevinthegreat1 · 2025-02-13T16:50:35Z

The vacuum solver needs a bit of testing and the potential bugs Aaron pointed out. I wasn't able to figure out how to use it.

WannaBeIan added 3 commits December 31, 2024 00:35

Sum visitors with alike crops, fix Farming XP/h regex, and improve pr…

74bbab6

…ecision for XP/h and Blocks/s

Added Show Stacks in Visitor Helper

6ebe2be

Re-added the drawItemEntry into drawScreen

5904edc

LifeIsAParadox added the reviews needed This PR needs reviews label Dec 31, 2024

AzureAaron added the new feature This issue or PR is a new feature label Dec 31, 2024

kevinthegreat1 requested changes Jan 2, 2025

View reviewed changes

LifeIsAParadox added changes requested This PR need changes and removed reviews needed This PR needs reviews labels Jan 2, 2025

LifeIsAParadox added reviews needed This PR needs reviews and removed changes requested This PR need changes labels Jan 3, 2025

WannaBeIan force-pushed the dev-env branch from 445bcf1 to 5904edc Compare January 6, 2025 03:23

LifeIsAParadox added changes requested This PR need changes and removed reviews needed This PR needs reviews labels Jan 6, 2025

WannaBeIan added 5 commits January 5, 2025 21:27

VacuumSolver, VisitorHelper, PestHighlighter

aa270bf

Forgot to fix highlight flicker in VacuumSolver

8d85dfb

removed imports from MBB

7c3edc0

.

fbe41b8

.

ec6e207

LifeIsAParadox added reviews needed This PR needs reviews and removed changes requested This PR need changes labels Jan 6, 2025

Emirlol reviewed Jan 6, 2025

View reviewed changes

src/main/java/de/hysky/skyblocker/utils/mayor/MayorUtils.java Show resolved Hide resolved

Updated Regex & MayorUtils catch block

834e354

WannaBeIan added 2 commits January 6, 2025 11:08

Forgot to add the visitor head and name coloring back into the render…

e140181

… method during some tests

Merge branch 'master' into dev-env

f0e9189

WannaBeIan requested a review from kevinthegreat1 January 10, 2025 01:48

WannaBeIan requested a review from Emirlol January 30, 2025 20:30

kevinthegreat1 mentioned this pull request Jan 31, 2025

Visitor Helper QoL? #1154

Open

AzureAaron added merge conflicts This PR has merge conflicts that need solving. and removed reviews needed This PR needs reviews labels Feb 4, 2025

kevinthegreat1 added 5 commits February 12, 2025 11:52

Refactor visitor package name

f388d3b

Clean up visitor helper and garden

df27b19

Clean up visitor helper some more

2d250b9

Fix visitor requirements

a2f74c9

Fix block breaks

37fd5f3

LifeIsAParadox added reviews needed This PR needs reviews and removed merge conflicts This PR has merge conflicts that need solving. labels Feb 12, 2025

kevinthegreat1 previously approved these changes Feb 12, 2025

View reviewed changes

LifeIsAParadox added merge me please Pull requests that are ready to merge and removed reviews needed This PR needs reviews labels Feb 12, 2025

AzureAaron reviewed Feb 12, 2025

View reviewed changes

AzureAaron added changes requested This PR need changes and removed merge me please Pull requests that are ready to merge labels Feb 13, 2025

LifeIsAParadox added merge me please Pull requests that are ready to merge and removed changes requested This PR need changes labels Feb 13, 2025

Use primitive types and fixes

39ea6d8

kevinthegreat1 dismissed their stale review via 39ea6d8 February 13, 2025 16:49

LifeIsAParadox added reviews needed This PR needs reviews and removed merge me please Pull requests that are ready to merge labels Feb 13, 2025

Missed a primitive

a32b1ad

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Garden Tweaks & Features #1118

Garden Tweaks & Features #1118

WannaBeIan commented Dec 31, 2024

kevinthegreat1 commented Jan 2, 2025

WannaBeIan commented Jan 6, 2025

WannaBeIan commented Jan 6, 2025

kevinthegreat1 left a comment

kevinthegreat1 Feb 12, 2025

kevinthegreat1 Feb 12, 2025

kevinthegreat1 Feb 12, 2025

AzureAaron Feb 12, 2025

kevinthegreat1 Feb 13, 2025

WannaBeIan Feb 25, 2025

AzureAaron Feb 12, 2025

kevinthegreat1 commented Feb 13, 2025

Garden Tweaks & Features #1118

Are you sure you want to change the base?

Garden Tweaks & Features #1118

Conversation

WannaBeIan commented Dec 31, 2024

kevinthegreat1 commented Jan 2, 2025

WannaBeIan commented Jan 6, 2025

WannaBeIan commented Jan 6, 2025

kevinthegreat1 left a comment

Choose a reason for hiding this comment

kevinthegreat1 Feb 12, 2025

Choose a reason for hiding this comment

kevinthegreat1 Feb 12, 2025

Choose a reason for hiding this comment

kevinthegreat1 Feb 12, 2025

Choose a reason for hiding this comment

AzureAaron Feb 12, 2025

Choose a reason for hiding this comment

kevinthegreat1 Feb 13, 2025

Choose a reason for hiding this comment

WannaBeIan Feb 25, 2025

Choose a reason for hiding this comment

AzureAaron Feb 12, 2025

Choose a reason for hiding this comment

kevinthegreat1 commented Feb 13, 2025