Improvement: Berberis Helper Rework #3147

RevengeLordOfMaj · 2025-01-02T11:11:03Z

What

Berberis is a crop in the Rift that grows one at a time, then needs to be broken in the same order they grew in. The base game guides you to each bush using particles. The problem with this is that the particles don't have the best visibility, and you can break the next bush as soon as the previous was broken, having you waste time waiting to see where the particles lead you.

SkyHanni already has a helper for this, which solves the particle visibility. It highlights the bush the particles are currently on when not moving, and follows them to the next bush while moving.

This new system shows you two bushes ahead of the one you need to break so you no longer have to wait for the particles!

It does this by watching them as they spawn in, and remembering the order they did so. It then highlights the next one to break, and the next two after that.

Images

2025-01-02.03-46-47.-.Trim.1.mp4

Changelog Improvements

Reworked Berberis Farming Helper in the Rift. - Maj
- Previews what bushes need to be broken after the current one if you were in the plot when they last regrew.
- If you were in another plot when they grew, or it is wrong about the order for any reason, it will fall back to the original helper.

github-actions · 2025-01-02T11:15:15Z

I have detected some issues with your pull request:

Body issues:
Change should end with a full stop in text: Initial Rework

Please fix these issues. For the correct format, refer to the pull request template.

github-actions · 2025-01-02T11:17:11Z

One or more Detekt Failures were detected:

RiftWiltedBerberisHelper.kt#L30: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L36: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L39: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L49: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L51: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L61: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L65: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L67: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L71: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L75: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L82: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L85: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L95: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L106: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L125: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L127: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L132: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L62: Missing spacing after "if"
RiftWiltedBerberisHelper.kt#L72: Missing spacing after "if"
RiftWiltedBerberisHelper.kt#L133: Missing spacing after "if"
RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L66: Using Array<Primitive> leads to implicit boxing and a performance hit.
RiftWiltedBerberisHelper.kt#L67: Line detected, which is longer than the defined maximum line length in the code style.
RiftWiltedBerberisHelper.kt#L66: Variable 'plotDistances' could be val.

github-actions · 2025-01-02T11:35:45Z

One or more Detekt Failures were detected:

RiftWiltedBerberisHelper.kt#L128: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L134: Missing newline after "{"

github-actions · 2025-01-03T10:35:35Z

One or more Detekt Failures were detected:

RiftWiltedBerberisHelper.kt#L160: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L167: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L254: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L255: Missing spacing after "if"
RiftWiltedBerberisHelper.kt#L122: Missing newline before ")"
RiftWiltedBerberisHelper.kt#L256: Missing spacing after ","
RiftWiltedBerberisHelper.kt#L119: Unexpected spacing before "("
RiftWiltedBerberisHelper.kt#L179: Unexpected spacing before "("
RiftWiltedBerberisHelper.kt#L222: Unexpected spacing before "("

hannibal002 · 2025-01-03T10:39:17Z

If you use IntelliJ, please click the auto refomat hotkey (control + alt + L) before every commit

RevengeLordOfMaj · 2025-01-03T10:41:20Z

oh my god thank you so much

github-actions · 2025-01-03T10:48:17Z

One or more Detekt Failures were detected:

RiftWiltedBerberisHelper.kt#L257: Expected space after opening comment.
RiftWiltedBerberisHelper.kt#L124: Line must not begin with "&&"

RevengeLordOfMaj · 2025-01-03T10:48:55Z

ok it didnt fix everything ig

RevengeLordOfMaj · 2025-01-03T10:51:38Z

torry I'm struggling with this so much 😭

hannibal002 · 2025-01-04T11:21:09Z

the wording of the changelog should be readable for users without technical knowledge (except the technical details/backend category). their "main line" should explain in a whole sentence what got changed in a broad statement, the "small line below" can include additional information about that change.

Your current wording is neither explanatory nor user ready, please change that

RevengeLordOfMaj · 2025-01-04T11:53:31Z

Updated. I hope this is better :)

hannibal002 · 2025-01-04T12:05:08Z

im talking about those two statements. they dont mean anything on its own. they are the only lines showing up in the changelog, the pr name or the description above is not there. so the user lacks the context what is this about at all. and the extra text below should not provide context but rather better explain what this change means.

e.g. you could call them "Reworked Berberis Particle Helper in the Rift", then mention that the new design will remember the order after one full clean of the field and additionally still use the legacy system as fallback/while the order is not loaded yet. also you can merge both entires into one and have two smaller sentences below.
e.g.

+ title. - your name
    * line 1
    * line 2

RevengeLordOfMaj · 2025-01-04T12:07:40Z

Ohh sorry my bad, 1 sec

RevengeLordOfMaj · 2025-01-04T12:14:13Z

That better?

hannibal002 · 2025-01-04T12:28:39Z

yes, way better. thanks!

…work

hannibal002

The feature works already perfectly fine for me. great job!

the code needs more cleanup before we can merge the pr though.

maybe you can separate the old and new logic into different functions and then remove the comments about it?

generally I think the code style needs a bit more kotlin-like funtions, e.g. the one i used in my cleanup commit above.

Maybe add an option how many lines/blocks in the future you want to see at once. for me, showing 3 blocks is too much :/

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

RevengeLordOfMaj · 2025-01-05T16:21:23Z

How does that look?

github-actions · 2025-01-05T16:25:57Z

One or more Detekt Failures were detected:

RiftWiltedBerberisHelper.kt#L246: Missing spacing around "+"

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

RevengeLordOfMaj · 2025-01-06T04:24:16Z

there :)

hannibal002 · 2025-01-07T14:15:18Z

please click on the resolve button when a comment is done. also please rerequest a review from me when you want me to look again at that pr

RevengeLordOfMaj · 2025-01-07T14:17:17Z

Oh sorry, this is my first time doing a pull request if it wasn't obvious :P

…work

hannibal002

more changes, but we are getting close to a ready PR :)

hannibal002 · 2025-01-07T18:03:17Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

+
+    @HandleEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(71, "rift.area.dreadfarm.wiltedBerberis.hideparticles", "rift.area.dreadfarm.wiltedBerberis.hideParticles")


you dont need to bup the version from 60 to 71, you dont change existing config elements

hannibal002 · 2025-01-07T18:05:13Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

+        // calculates the player's distance to the center of each plot, then sets closestPlot to the smallest
+        val plotDistances = arrayListOf(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
+        for (i in 0..5) {
+            val plotCenter = plots[i].a.middle(plots[i].b)


please only calculate the middle location once, then reuse the same value

hannibal002 · 2025-01-07T18:09:35Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

+        event.move(71, "rift.area.dreadfarm.wiltedBerberis.hideparticles", "rift.area.dreadfarm.wiltedBerberis.hideParticles")
+    }
+
+    private fun getClosestPlot() {


instead of this approach with array list, two for loops and manual comparing each entry against the prevous losetest plot, you can use lamda functions on a map like .minBy() to get the clostest plot. i think of something like cloestPlot = plots.map{ it to it.middle.distanceToPlayer() }.minBy{it.second}.first. then you can store the instance inseatd of the index in the closestPlot value.

hannibal002 · 2025-01-07T18:11:01Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

+        val plotCornerA = plots[closestPlot].a.toBlockPos()
+        val plotCornerB = plots[closestPlot].b.toBlockPos()
+        for (block in BlockPos.getAllInBox(plotCornerA, plotCornerB)) {
+            if (block.toLorenzVec().getBlockAt() == Blocks.deadbush && !berberisList.contains(block.toLorenzVec())) {


merge all usages of block.toLorenzVec() into one variable

hannibal002 · 2025-01-07T18:11:49Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

+        list = list.editCopy { removeIf { it.lastTime.passedSince() > 500.milliseconds } }
+    }
+
+    private fun sync() {


give this function a better name

hannibal002 · 2025-01-07T18:13:30Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

        for (berberis in list) {
            with(berberis) {
                if (currentParticles.distanceToPlayer() > 20) continue
                if (y == 0.0) continue

                val location = currentParticles.fixLocation(berberis)
                if (!moving) {
-                    event.drawFilledBoundingBoxNea(axisAlignedBB(location), Color.YELLOW, 0.7f)
+                    event.drawFilledBoundingBoxNea(axisAlignedBB(location), config.highlightColor.toSpecialColor(), 0.7f)


toSpecialColor is a heavy logic, please move it outside of the for loop

hannibal002 · 2025-01-07T18:13:44Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

-    @HandleEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(60, "rift.area.dreadfarm.wiltedBerberis.hideparticles", "rift.area.dreadfarm.wiltedBerberis.hideParticles")
+    private fun primaryRender(event: LorenzRenderWorldEvent) {


better name

hannibal002 · 2025-01-07T18:14:46Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

@@ -33,10 +36,30 @@ object RiftWiltedBerberisHelper {
    private val config get() = RiftAPI.config.area.dreadfarm.wiltedBerberis
    private var isOnFarmland = false
    private var hasFarmingToolInHand = false
+    private var berberisList = listOf<LorenzVec>()


give this list below better names to differentiate

hannibal002 · 2025-01-07T18:16:08Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

    }

-    private fun axisAlignedBB(loc: LorenzVec) = loc.add(0.1, -0.1, 0.1).boundingToOffset(0.8, 1.0, 0.8).expandBlock()
+    private fun nearestBerberis(location: LorenzVec): WiltedBerberis? =


try to change the logic so that the distance is only getting calculated once per entry, not twice

hannibal002 · 2025-01-07T18:21:17Z

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

+    )
+
+    private var closestPlot = 0
+    private var oldClosest = 0


change those two variable sto be of type Plot?

github-actions · 2025-01-24T05:29:41Z

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

…work # Conflicts: # src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

github-actions · 2025-01-25T16:20:23Z

Conflicts have been resolved! 🎉

Initial Rework

40636dd

github-actions bot added the Wrong Title/Changelog There is an error in the title or changelog label Jan 2, 2025

github-actions bot added the Detekt Has detekt problem label Jan 2, 2025

github-actions bot removed the Wrong Title/Changelog There is an error in the title or changelog label Jan 2, 2025

Detekt Fixes

09933a7

Final Detekt Fixes Please

739b8fd

github-actions bot removed the Detekt Has detekt problem label Jan 2, 2025

Fallback System

c680061

github-actions bot added the Detekt Has detekt problem label Jan 3, 2025

Detekt

fcecd08

Detekt Once More

12b8a4a

github-actions bot removed the Detekt Has detekt problem label Jan 3, 2025

hannibal002 added this to the Version 1.1.0 milestone Jan 4, 2025

hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Jan 4, 2025

Merge branch 'refs/heads/beta' into fork/RevengeLordOfMaj/Berberis-Re…

486350a

…work

code cleanup

9558018

hannibal002 requested changes Jan 4, 2025

View reviewed changes

Cleanup and QOL

d4390aa

github-actions bot added the Detekt Has detekt problem label Jan 5, 2025

Sorry mister detekt sir

67bc299

github-actions bot removed the Detekt Has detekt problem label Jan 5, 2025

jani270 requested changes Jan 5, 2025

View reviewed changes

src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt Outdated Show resolved Hide resolved

Config Version

e31bcf5

RevengeLordOfMaj requested review from hannibal002 and jani270 January 7, 2025 14:17

hannibal002 added 2 commits January 7, 2025 18:55

Merge branch 'refs/heads/beta' into fork/RevengeLordOfMaj/Berberis-Re…

6e5d77d

…work

code cleanup

92c7f03

hannibal002 requested changes Jan 7, 2025

View reviewed changes

CalMWolfs added 5 commits January 8, 2025 10:36

Merge branch 'beta' into Berberis-Rework

0ed8811

Merge branch 'beta' into Berberis-Rework

3f04b13

Merge branch 'beta' into Berberis-Rework

af18940

Merge branch 'beta' into Berberis-Rework

a35e02c

Merge branch 'beta' into Berberis-Rework

a90fe07

CalMWolfs removed the Soon This Pull Request will be merged within the next couple of betas label Jan 18, 2025

github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 24, 2025

hannibal002 added 2 commits January 25, 2025 17:18

Merge branch 'refs/heads/beta' into fork/RevengeLordOfMaj/Berberis-Re…

f320b52

…work # Conflicts: # src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt

code cleanup

fc19acb

github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvement: Berberis Helper Rework #3147

Improvement: Berberis Helper Rework #3147

RevengeLordOfMaj commented Jan 2, 2025 •

edited

Loading

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 3, 2025

hannibal002 commented Jan 3, 2025

RevengeLordOfMaj commented Jan 3, 2025

github-actions bot commented Jan 3, 2025

RevengeLordOfMaj commented Jan 3, 2025

RevengeLordOfMaj commented Jan 3, 2025

hannibal002 commented Jan 4, 2025

RevengeLordOfMaj commented Jan 4, 2025

hannibal002 commented Jan 4, 2025

RevengeLordOfMaj commented Jan 4, 2025

RevengeLordOfMaj commented Jan 4, 2025

hannibal002 commented Jan 4, 2025

hannibal002 left a comment

RevengeLordOfMaj commented Jan 5, 2025

github-actions bot commented Jan 5, 2025

RevengeLordOfMaj commented Jan 6, 2025

hannibal002 commented Jan 7, 2025

RevengeLordOfMaj commented Jan 7, 2025

hannibal002 left a comment

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025 •

edited

Loading

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025

hannibal002 Jan 7, 2025

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 25, 2025

Improvement: Berberis Helper Rework #3147

Are you sure you want to change the base?

Improvement: Berberis Helper Rework #3147

Conversation

RevengeLordOfMaj commented Jan 2, 2025 • edited Loading

What

Changelog Improvements

github-actions bot commented Jan 2, 2025

github-actions bot commented Jan 2, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 2, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 3, 2025

One or more Detekt Failures were detected:

hannibal002 commented Jan 3, 2025

RevengeLordOfMaj commented Jan 3, 2025

github-actions bot commented Jan 3, 2025

One or more Detekt Failures were detected:

RevengeLordOfMaj commented Jan 3, 2025

RevengeLordOfMaj commented Jan 3, 2025

hannibal002 commented Jan 4, 2025

RevengeLordOfMaj commented Jan 4, 2025

hannibal002 commented Jan 4, 2025

RevengeLordOfMaj commented Jan 4, 2025

RevengeLordOfMaj commented Jan 4, 2025

hannibal002 commented Jan 4, 2025

hannibal002 left a comment

Choose a reason for hiding this comment

RevengeLordOfMaj commented Jan 5, 2025

github-actions bot commented Jan 5, 2025

One or more Detekt Failures were detected:

RevengeLordOfMaj commented Jan 6, 2025

hannibal002 commented Jan 7, 2025

RevengeLordOfMaj commented Jan 7, 2025

hannibal002 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hannibal002 Jan 7, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 25, 2025

RevengeLordOfMaj commented Jan 2, 2025 •

edited

Loading

hannibal002 Jan 7, 2025 •

edited

Loading