feat(nextgen)(in progress): added ability to limit amount of different items #3784
Conversation
There was a problem hiding this comment.
Thank you for working on this! Nobody was brave enough to tackle this in a long time haha. This feature will be very useful when it is there.
I will help by creating a powerful interface for CleanupPlanGenerator which would support filter groups, if you want to use them :)
| availableItems.forEach { slot -> | ||
| val limit = template.itemLimitPerItem[slot.itemStack.item] ?: Int.MAX_VALUE | ||
| var itemCount = packer.usefulItems.count { it.itemStack.item == slot.itemStack.item } | ||
| packer.usefulItems.removeIf { | ||
| if (itemCount > limit) { | ||
| logger.info("removed item from useful items list") | ||
| itemCount-- | ||
| return@removeIf true | ||
| } | ||
| false | ||
| } | ||
| } |
There was a problem hiding this comment.
This is pretty hacky and doesn't really integrate with the rest of the code.
There was a problem hiding this comment.
This is pretty hacky and doesn't really integrate with the rest of the code.
I agree, I will refactor this later
| @Suppress("UnusedPrivateProperty") | ||
| private val addNewFilter by boolean("AddNewFilter", false).onChange { | ||
| val itemType: Value<MutableList<Item>> = items("ItemsToLimit", mutableListOf()).onChanged { | ||
| recount() | ||
| } | ||
| val itemLimit: Value<Int> = int("MaxItemSlots", 0, 0..40).onChanged { | ||
| recount() | ||
| } | ||
| presentSettings.add(Pair(itemType, itemLimit)) | ||
| false | ||
| } | ||
|
|
||
| @Suppress("UnusedPrivateProperty") | ||
| private val deleteFilter by boolean("DeleteFilter", false).onChange { | ||
| listOf("ItemsToLimit", "MaxItemSlots").forEach { name -> | ||
| val index = inner.indexOfFirst { it.name == name } | ||
| inner.removeAt(index) | ||
| } | ||
| recount() | ||
| false | ||
| } |
There was a problem hiding this comment.
Seems hacky.
@SenkJu is this ok?
| private fun recount() { | ||
| val limits = mutableMapOf<Item, Int>() | ||
| presentSettings.forEach { (itemsValue, countValue) -> | ||
| val count = countValue.get() | ||
| itemsValue.get().forEach { item -> | ||
| val limitState = limits[item] | ||
| // we just follow the lowest filter | ||
| limits[item] = if (limitState == null) { | ||
| count | ||
| } else { | ||
| min(count, limitState) | ||
| } | ||
| } | ||
| } | ||
| itemLimits = limits | ||
| } |
There was a problem hiding this comment.
The user configures i.e.:
- Firery Items:
- items:
- minecraft:flint_and_steel
- minecraft:lava_bucket
- limit: 2As a user I'd think that the group Firery Items acts as a filter group and accepts 2 of any of the given items. (i.e. Lava, Lighter) or (Lighter, Lighter). But the client would accept 2 of each. (i.e. Lava, Lava, Lighter, Lighter). Is that the desired behaviour?
There was a problem hiding this comment.
The user configures i.e.:
- Firery Items: - items: - minecraft:flint_and_steel - minecraft:lava_bucket - limit: 2As a user I'd think that the group
Firery Itemsacts as a filter group and accepts 2 of any of the given items. (i.e.Lava, Lighter) or (Lighter, Lighter). But the client would accept 2 of each. (i.e.Lava, Lava, Lighter, Lighter). Is that the desired behaviour?
I think it should be like this, may be it would be good to add ability to add new limits per category (and add various categories like Firery items (we can also possibly add ability to add new categories, but that seems kinda unnecessary))
current issues: