Feature: Shopping List #3281

rueblimaster · 2025-01-24T09:37:55Z

What

Adds a general shopping list, can be added to by other features etc. also can break down items into their recipes

TODO: add technical details, screenshots

Images

Changelog New Features

Added shopping list. - rueblimaster
- TODO: Extra info.

github-actions · 2025-01-24T09:44:18Z

One or more Detekt Failures were detected:

ShoppingList.kt#L126: Missing spacing after "{"
ShoppingList.kt#L126: Missing spacing before "}"
ShoppingList.kt#L4: Unused import
ShoppingList.kt#L5: Unused import
ShoppingList.kt#L13: Unused import
ShoppingList.kt#L21: Unused import
ShoppingList.kt#L31: A member is named after the object. This might result in confusion. Please rename the member.
ShoppingList.kt#L80: Private property totalPrice is unused.
ShoppingList.kt#L80: Variable 'totalPrice' could be val.
ShoppingListItem.kt#L11: Private property subItems is unused.

into shopping-list

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt

github-actions · 2025-01-24T09:54:27Z

One or more Detekt Failures were detected:

ShoppingList.kt#L76: Private property totalPrice is unused.
ShoppingList.kt#L76: Variable 'totalPrice' could be val.
ShoppingListItem.kt#L11: Private property subItems is unused.

+ continued a little

github-actions · 2025-01-24T21:06:42Z

One or more Detekt Failures were detected:

ShoppingListItem.kt#L22: Private property allRecipes is unused.

src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt

github-actions · 2025-01-24T21:29:58Z

One or more Detekt Failures were detected:

ShoppingList.kt#L87: Expected a single white space before start of function body
ShoppingList.kt#L92: Expected a single white space before start of function body
ShoppingList.kt#L87: Missing spacing before "{"
ShoppingList.kt#L92: Missing spacing before "{"
ShoppingListItem.kt#L22: Private property allRecipes is unused.

github-actions · 2025-01-25T23:17:21Z

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

github-actions · 2025-01-26T07:58:49Z

Conflicts have been resolved! 🎉

github-actions · 2025-01-26T08:39:21Z

One or more Detekt Failures were detected:

ShoppingListItem.kt#L22: Private property allRecipes is unused.

github-actions · 2025-01-26T10:30:42Z

One or more Detekt Failures were detected:

ShoppingList.kt#L56: Function remove has 8 return statements which exceeds the limit of 5.
ShoppingListItem.kt#L25: Private property allRecipes is unused.

github-actions · 2025-01-26T16:09:13Z

One or more Detekt Failures were detected:

ShoppingListItem.kt#L25: Private property allRecipes is unused.

github-actions · 2025-01-27T19:15:37Z

One or more Detekt Failures were detected:

ShoppingListItem.kt#L62: Redundant "toString()" call in string template
ShoppingListItem.kt#L65: Redundant curly braces
ShoppingListCategory.kt#L11: Unnecessary long whitespace
ShoppingListItem.kt#L32: Private property allRecipes is unused.
ShoppingListItem.kt#L45: Private property i is unused.

rueblimaster · 2025-02-28T21:10:18Z

oh shit, now I gotta do detekt

into shopping-list

rueblimaster · 2025-03-01T19:07:35Z

why doesn't this pass the checks???

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingListItem.kt

src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt

github-actions · 2025-03-02T17:07:21Z

12 Detekt Failures were detected:

ShoppingListCategory.kt#L62: Name shadowed: item
Renderable.kt#L285: Name shadowed: onAnyClick
Renderable.kt#L300: Name shadowed: implicit lambda parameter 'it'
ShoppingList.kt#L437: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L444: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L444: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L447: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L447: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingListCategory.kt#L27: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingListItem.kt#L68: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L223: Variable 'lore' could be val.
ShoppingListCategory.kt#L62: Variable 'item' could be val.

github-actions · 2025-03-02T17:22:45Z

12 Detekt Failures were detected:

ShoppingListCategory.kt#L62: Name shadowed: item
Renderable.kt#L267: Name shadowed: onAnyClick
Renderable.kt#L282: Name shadowed: implicit lambda parameter 'it'
ShoppingList.kt#L437: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L444: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L444: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L447: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L447: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingListCategory.kt#L27: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingListItem.kt#L68: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L223: Variable 'lore' could be val.
ShoppingListCategory.kt#L62: Variable 'item' could be val.

add now, soon or later and maybe or not maybe

github-actions · 2025-03-02T17:52:55Z

8 Detekt Failures were detected:

ShoppingListCategory.kt#L26: Missing spacing before "?:"
ShoppingList.kt#L437: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L444: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L444: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L447: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L447: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingListItem.kt#L68: Calling !! on a nullable type will throw a NullPointerException at runtime in case the value is null. It should be avoided.
ShoppingList.kt#L223: Variable 'lore' could be val.

rueblimaster · 2025-03-02T18:25:24Z

yay!

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingListCategory.kt

Bloxigus · 2025-03-04T02:42:38Z

src/main/java/at/hannibal2/skyhanni/data/SackApi.kt

@@ -351,6 +351,7 @@ object SackApi {
        sackListNames = uniqueSackItems.map { it.itemNameWithoutColor.removeNonAscii().trim().uppercase() }.toSet()
    }

+    // TODO: also update sacks when items are added/removed from sack, not only on summary


You should probably remove TODOs if you aren't intending on doing it, and commented code that you don't intend on uncommenting

DavidArthurCole · 2025-03-04T03:20:19Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/CategoryTemplate.kt

+
+import com.google.gson.annotations.Expose
+
+class CategoryTemplate {


I'm not gonna suggest the change on each of them individually, as there are a lot, but do not define explicit constructor()s for Kotlin classes where it isn't necessary to.

Suggested change

class CategoryTemplate {

class CategoryTemplate(

@Expose val name: String,

@Expose val color: Char = '6',

@Expose val hidden: Boolean = false,

@Expose val items: List<ItemTemplate> = emptyList(),

) {

DavidArthurCole · 2025-03-04T03:22:37Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ItemTemplate.kt

+
+import com.google.gson.annotations.Expose
+
+class ItemTemplate {


Remove explicit constructor

DavidArthurCole · 2025-03-04T03:22:45Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/RecipeTemplate.kt

+import at.hannibal2.skyhanni.utils.PrimitiveRecipe
+import com.google.gson.annotations.Expose
+
+class RecipeTemplate {


Remove explicit constructor

DavidArthurCole · 2025-03-04T03:23:57Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt

+        }
+    }
+
+    @HandleEvent(onlyOnSkyblock = true, priority = HandleEvent.HIGH)


Doesn't seem this has a purpose to be high priority.

DavidArthurCole · 2025-03-04T03:24:40Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt

+
+        clear()
+
+        add("aspect of the end".toInternalName(), 2.0, "Weapons")


DavidArthurCole · 2025-03-04T03:25:45Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt

+    }
+
+    // maybe name it removeCommand ???
+    fun remove(name: String, amount: Double? = null, categoryName: String? = null) {


This function is 3-4 nested if statements - refactor it into some helper functions if necessary, but this ain't it

DavidArthurCole · 2025-03-04T03:26:20Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt

+
+        fun get(item: NeuInternalName) = allItems[item]
+    }
+


.toSearchable()

DavidArthurCole · 2025-03-04T03:27:12Z

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt

+            val items = items
+
+            allItems.clear()
+            for (category in categories + items) {


Define some vals here instead of nestedly looping, especially using similar names, it gets unreadable quickly.

rueblimaster added 2 commits January 23, 2025 22:03

start with it

0d56067

Merge branch 'hannibal002:beta' into shopping-list

182a78f

rueblimaster marked this pull request as draft January 24, 2025 09:38

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

rueblimaster added 2 commits January 24, 2025 10:47

a little detekt

7f1cf99

Merge branch 'shopping-list' of https://github.com/rueblimaster/SkyHanni

8f9876b

into shopping-list

j10a1n15 suggested changes Jan 24, 2025

View reviewed changes

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt Outdated Show resolved Hide resolved

rueblimaster added 3 commits January 24, 2025 20:56

Merge branch 'hannibal002:beta' into shopping-list

98c0fb2

add ShoppingListItem.toString()

1fe20a1

+ continued a little

start with the rly basic logic etc stuff

7da99a6

Thunderblade73 reviewed Jan 24, 2025

View reviewed changes

src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt Outdated Show resolved Hide resolved

figure out rendering

95705fb

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

Merge branch 'beta' into shopping-list

adba3f3

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

rueblimaster added 2 commits January 26, 2025 09:06

move command back here + some detekt

0698ff9

refractor NEU to Neu

044f81b

added most of the add/remove logic

9f02dd8

reduce amount of returns in 1 function

419f1d2

continue

b442fb5

rueblimaster marked this pull request as ready for review February 28, 2025 21:10

rueblimaster added 2 commits February 28, 2025 22:17

detekt

812b309

Merge branch 'shopping-list' of https://github.com/rueblimaster/SkyHanni

9532378

into shopping-list

hannibal002 added this to the 3.0.0 milestone Mar 1, 2025

Merge branch 'hannibal002:beta' into shopping-list

32cfe3d

j10a1n15 reviewed Mar 1, 2025

View reviewed changes

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingListItem.kt Outdated Show resolved Hide resolved

Bloxigus reviewed Mar 2, 2025

View reviewed changes

src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt Show resolved Hide resolved

final detekt

44f7928

improve ClickTypeWithModifiers

6d6ae88

rueblimaster added 3 commits March 2, 2025 18:35

classify TODOs

6d58583

add now, soon or later and maybe or not maybe

detekt ShoppingListCategory.kt

a63027f

detekt Renderable.kt

be64ae3

rueblimaster added 2 commits March 2, 2025 19:09

as always: some detekt

6ea7f63

detekt ShoppingList.kt

bd0a88b

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

reduce print statements and add user feedback messages

e54e074

Bloxigus reviewed Mar 3, 2025

View reviewed changes

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingList.kt Show resolved Hide resolved

Bloxigus reviewed Mar 3, 2025

View reviewed changes

src/main/java/at/hannibal2/skyhanni/features/inventory/shoppinglist/ShoppingListCategory.kt Outdated Show resolved Hide resolved

rueblimaster added 4 commits March 3, 2025 20:32

Update ShoppingListItem.kt

96d231e

switch category to new renderable

cff4d62

add category.isEmpty()

891369e

add onDebugDataCollect()

a962938

Bloxigus reviewed Mar 4, 2025

View reviewed changes

DavidArthurCole suggested changes Mar 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Shopping List #3281

Feature: Shopping List #3281

rueblimaster commented Jan 24, 2025 •

edited

Loading

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 24, 2025

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 26, 2025

github-actions bot commented Jan 26, 2025

github-actions bot commented Jan 26, 2025

github-actions bot commented Jan 26, 2025

github-actions bot commented Jan 27, 2025

rueblimaster commented Feb 28, 2025

rueblimaster commented Mar 1, 2025

github-actions bot commented Mar 2, 2025

github-actions bot commented Mar 2, 2025

github-actions bot commented Mar 2, 2025

rueblimaster commented Mar 2, 2025

Bloxigus Mar 4, 2025

DavidArthurCole Mar 4, 2025

DavidArthurCole Mar 4, 2025

DavidArthurCole Mar 4, 2025

DavidArthurCole Mar 4, 2025

DavidArthurCole Mar 4, 2025

DavidArthurCole Mar 4, 2025

DavidArthurCole Mar 4, 2025

DavidArthurCole Mar 4, 2025


		import com.google.gson.annotations.Expose

		class CategoryTemplate {

-class CategoryTemplate {
+class CategoryTemplate(
+	@Expose val name: String,
+	@Expose val color: Char = '6',
+	@Expose val hidden: Boolean = false,
+	@Expose val items: List<ItemTemplate> = emptyList(),
+) {


		import com.google.gson.annotations.Expose

		class ItemTemplate {


		clear()

		add("aspect of the end".toInternalName(), 2.0, "Weapons")

Feature: Shopping List #3281

Are you sure you want to change the base?

Feature: Shopping List #3281

Conversation

rueblimaster commented Jan 24, 2025 • edited Loading

What

Changelog New Features

github-actions bot commented Jan 24, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 24, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 24, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 24, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 26, 2025

github-actions bot commented Jan 26, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 26, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 26, 2025

One or more Detekt Failures were detected:

github-actions bot commented Jan 27, 2025

One or more Detekt Failures were detected:

rueblimaster commented Feb 28, 2025

rueblimaster commented Mar 1, 2025

github-actions bot commented Mar 2, 2025

12 Detekt Failures were detected:

github-actions bot commented Mar 2, 2025

12 Detekt Failures were detected:

github-actions bot commented Mar 2, 2025

8 Detekt Failures were detected:

rueblimaster commented Mar 2, 2025

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

rueblimaster commented Jan 24, 2025 •

edited

Loading