Added support for sorting by accumulated item count.

blackd · blackd · commit 7c4b000670bb · 2023-04-01T18:49:27.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -88,7 +88,7 @@ allprojects {
     group = "org.anti-ad.mc"
     ext.set("mod_artefact_version", versionObj.toCleanString())
     ext.set("mod_artefact_is_release", versionObj.isRelease())
-    ext.set("libIPN_version", "2.0.5-SNAPSHOT")
+    ext.set("libIPN_version", "2.0.4")
 
     tasks.withType<JavaCompile>().configureEach {
         options.isFork = true
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,36 @@
 <!-- latest begin -->
 
+### 1.9.5
+
+- Added support for sorting based on the accumulated count of item type.
+  It can be selected in `Mod Settings -> Sort Order` there are two variants `Item Count Ascending` and `Item Count Descending`.
+  
+  It also can be used in custom rules like this `::accumulated_count(number_order = ascending)`, by default the rule is in descending order.
+- Added full support for [Carpet's](https://www.curseforge.com/minecraft/mc-mods/carpet) stacable empty shulker boxes. Works only in 1.18-1.19.
+  Doesn't support the forge port of Carpet. *You need to have carpet installed on the client.*
+  1.16 is not supported due to limitations in Carpet for that version of minecraft.
+- Other oversized stacks are now always left in their original positions when sorting.
+
+
+### WARNING
+
+Due to multiple Quilt specific crashes and one item duplication Quilt support is now defined as fallows:
+
+```
+This mod will work on Quilt using the offered Fabric compatibility.
+Any problems that are not reproducible on Fabric will be addressed with very low priority.
+```
+
+#### Supported Minecraft versions
+- **1.16.x**
+- **1.18.2**
+- **1.19[.1-2]**
+- **1.19.3**
+- **1.19.4**
+
+<!-- latest end -->
+<!-- rest begin -->
+
 ### 1.9.4
 
 - Added support for 1.19.4 Forge.
@@ -33,8 +64,6 @@ Any problems that are not reproducible on Fabric will be addressed with very low
 
 ### Become a [Patreon](https://www.patreon.com/mirinimi/membership) to gain early access
 
-<!-- latest end -->
-
 
 ### 1.9.2
 
@@ -52,10 +81,6 @@ Any problems that are not reproducible on Fabric will be addressed with very low
 - **1.19.3**
 
 
-<!-- latest end -->
-
-<!-- rest begin -->
-
 ### 1.9.1
 
 - Added translation for Chinese Traditional thanks to 午夜的大叔
diff --git a/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/compat/integrations/Integrations.kt b/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/compat/integrations/Integrations.kt
@@ -20,6 +20,7 @@
 package org.anti_ad.mc.ipnext.compat.integrations
 
 import org.anti_ad.mc.common.extensions.trySwallow
+import org.anti_ad.mc.common.vanilla.alias.Slot
 
 object Integrations {
 
@@ -31,9 +32,14 @@ object Integrations {
         }
 
 
+    var ___getSophisticatedMaxCount: (Slot) -> Int = { -1 }
+
+
     fun init() {
         trySwallow {
             CarpetIntegration().init()
         }
     }
+
+    fun sophisticatedMaxCount(sourceSlot: Slot): Int = ___getSophisticatedMaxCount(sourceSlot)
 }
diff --git a/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/ingame/VanillaAccessors.kt b/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/ingame/VanillaAccessors.kt
@@ -64,13 +64,18 @@ import org.anti_ad.mc.common.vanilla.alias.ItemStack as VanillaItemStack
 
 // use `()` to avoid potential mapping name collision
 
-inline val VanillaItemStack.`(itemType)`: ItemType
+val VanillaItemStack.`(itemType)`: ItemType
     get() = ItemType(item,
                      tag,
-                     { isDamageable })
+                     { isDamageable },
+                     stackSource = { v: ItemType ->
+                         ItemStack(v, count)
+                     })
+
 inline val VanillaItemStack.`(itemStack)`: ItemStack
     get() = if (isEmpty) ItemStack.EMPTY else ItemStack(`(itemType)`,
                                                         count)
+
 inline val VanillaItemStack.`(mutableItemStack)`: MutableItemStack
     get() = if (isEmpty) MutableItemStack.empty() else MutableItemStack(`(itemType)`,
                                                                         count)
@@ -86,11 +91,11 @@ inline val Slot.`(id)`
 inline val Slot.`(invSlot)`
     get() = (this as IMixinSlot).invSlot
 inline val Slot.`(itemStack)`: ItemStack
-    get() = stack.`(itemStack)`
+    get() = stack.`(itemStack)`.also { it.sourceSlot = this }
 inline val Slot.`(vanillaStack)`: VanillaItemStack
     get() = this.stack
 inline val Slot.`(mutableItemStack)`: MutableItemStack
-    get() = stack.`(mutableItemStack)`
+    get() = stack.`(mutableItemStack)`.also { it.sourceSlot = this }
 inline val Slot.`(inventory)`: Inventory
     get() = inventory
 inline val Slot.`(inventoryOrNull)`: Inventory?
diff --git a/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt b/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt
@@ -22,9 +22,9 @@ package org.anti_ad.mc.ipnext.item
 
 import net.minecraft.block.ShulkerBoxBlock
 import net.minecraft.entity.effect.StatusEffectType
+import net.minecraft.item.BlockItem
 import org.anti_ad.mc.ipnext.Log
 import org.anti_ad.mc.common.extensions.ifTrue
-import org.anti_ad.mc.common.vanilla.alias.BlockItem
 import org.anti_ad.mc.common.vanilla.alias.Enchantment
 import org.anti_ad.mc.common.vanilla.alias.EnchantmentHelper
 import org.anti_ad.mc.common.vanilla.alias.FoodComponent
@@ -87,8 +87,12 @@ inline val ItemType.isEmptyShulker: Boolean
 inline val ItemType.maxCount: Int
     get() {
         val carpetEmptyShulkersStackSize = Integrations.carpetEmptyShulkersStackSize
+        val slot = sourceStack?.sourceSlot
+
         return if (carpetEmptyShulkersStackSize > 1 && isEmptyShulker) {
             carpetEmptyShulkersStackSize
+        } else if (slot != null && Integrations.sophisticatedMaxCount(slot) != -1) {
+            return Integrations.sophisticatedMaxCount(slot)
         } else {
             vanillaStack.maxCount
         }
diff --git a/platforms/fabric-1.16/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/fabric-1.16/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -30,3 +30,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/fabric-1.18.2/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt b/platforms/fabric-1.18.2/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt
@@ -24,9 +24,9 @@ package org.anti_ad.mc.ipnext.item
 
 import net.minecraft.block.ShulkerBoxBlock
 import net.minecraft.entity.effect.StatusEffectCategory
+import net.minecraft.item.BlockItem
 import org.anti_ad.mc.ipnext.Log
 import org.anti_ad.mc.common.extensions.ifTrue
-import org.anti_ad.mc.common.vanilla.alias.BlockItem
 import org.anti_ad.mc.common.vanilla.alias.Enchantment
 import org.anti_ad.mc.common.vanilla.alias.EnchantmentHelper
 import org.anti_ad.mc.common.vanilla.alias.FoodComponent
diff --git a/platforms/fabric-1.18.2/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/fabric-1.18.2/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -30,3 +30,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/fabric-1.19.3/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt b/platforms/fabric-1.19.3/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt
@@ -24,11 +24,11 @@ package org.anti_ad.mc.ipnext.item
 
 import net.minecraft.block.ShulkerBoxBlock
 import net.minecraft.entity.effect.StatusEffectCategory
+import net.minecraft.item.BlockItem
 import net.minecraft.text.TranslatableTextContent
 import org.anti_ad.mc.ipnext.Log
 import org.anti_ad.mc.common.extensions.ifTrue
 import org.anti_ad.mc.common.vanilla.Vanilla
-import org.anti_ad.mc.common.vanilla.alias.BlockItem
 import org.anti_ad.mc.common.vanilla.alias.Enchantment
 import org.anti_ad.mc.common.vanilla.alias.EnchantmentHelper
 import org.anti_ad.mc.common.vanilla.alias.FoodComponent
diff --git a/platforms/fabric-1.19.3/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/fabric-1.19.3/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -29,3 +29,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/fabric-1.19.4/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt b/platforms/fabric-1.19.4/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt
@@ -24,11 +24,11 @@ package org.anti_ad.mc.ipnext.item
 
 import net.minecraft.block.ShulkerBoxBlock
 import net.minecraft.entity.effect.StatusEffectCategory
+import net.minecraft.item.BlockItem
 import net.minecraft.text.TranslatableTextContent
 import org.anti_ad.mc.ipnext.Log
 import org.anti_ad.mc.common.extensions.ifTrue
 import org.anti_ad.mc.common.vanilla.Vanilla
-import org.anti_ad.mc.common.vanilla.alias.BlockItem
 import org.anti_ad.mc.common.vanilla.alias.Enchantment
 import org.anti_ad.mc.common.vanilla.alias.EnchantmentHelper
 import org.anti_ad.mc.common.vanilla.alias.FoodComponent
diff --git a/platforms/fabric-1.19.4/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/fabric-1.19.4/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -29,3 +29,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/fabric-1.19/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt b/platforms/fabric-1.19/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt
@@ -24,9 +24,9 @@ package org.anti_ad.mc.ipnext.item
 
 import net.minecraft.block.ShulkerBoxBlock
 import net.minecraft.entity.effect.StatusEffectCategory
+import net.minecraft.item.BlockItem
 import org.anti_ad.mc.ipnext.Log
 import org.anti_ad.mc.common.extensions.ifTrue
-import org.anti_ad.mc.common.vanilla.alias.BlockItem
 import org.anti_ad.mc.common.vanilla.alias.Enchantment
 import org.anti_ad.mc.common.vanilla.alias.EnchantmentHelper
 import org.anti_ad.mc.common.vanilla.alias.FoodComponent
diff --git a/platforms/fabric-1.19/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/fabric-1.19/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -30,3 +30,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/forge-1.16/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/forge-1.16/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -30,3 +30,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/forge-1.18.2/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/forge-1.18.2/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -30,3 +30,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/forge-1.19.3/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt b/platforms/forge-1.19.3/src/main/java/org/anti_ad/mc/ipnext/item/ItemTypeExtensions.kt
@@ -24,12 +24,12 @@ package org.anti_ad.mc.ipnext.item
 
 import net.minecraft.network.chat.contents.TranslatableContents
 import net.minecraft.world.effect.MobEffectCategory
+import net.minecraft.world.item.BlockItem
 import net.minecraft.world.level.block.ShulkerBoxBlock
 import net.minecraftforge.common.extensions.IForgeFluid
 import org.anti_ad.mc.ipnext.Log
 import org.anti_ad.mc.common.extensions.ifTrue
 import org.anti_ad.mc.common.vanilla.Vanilla
-import org.anti_ad.mc.common.vanilla.alias.BlockItem
 import org.anti_ad.mc.common.vanilla.alias.Enchantment
 import org.anti_ad.mc.common.vanilla.alias.EnchantmentHelper
 import org.anti_ad.mc.common.vanilla.alias.FoodComponent
@@ -110,7 +110,6 @@ fun ItemType.vanillaStackWithCount(count: Int): VanillaItemStack =
         VanillaItemStack(this.item,
                          count).apply { tag = this@vanillaStackWithCount.tag }
 
-@Suppress("DEPRECATION")
 inline val ItemType.identifier: Identifier
     get() = ForgeRegistries.ITEMS.getKey(item)!! // `(getIdentifier)`(item)
 
diff --git a/platforms/forge-1.19.3/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/forge-1.19.3/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -29,3 +29,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/forge-1.19.4/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/forge-1.19.4/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -29,3 +29,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/platforms/forge-1.19/build.gradle.kts b/platforms/forge-1.19/build.gradle.kts
@@ -149,6 +149,9 @@ configurations {
 
 dependencies {
     //runtimeOnly( fg.deobf("curse.maven:iron-furnaces-237664:4009901"))
+    runtimeOnly( fg.deobf("curse.maven:sophisticated-storage-619320:4231388"))
+    runtimeOnly( fg.deobf("curse.maven:sophisticated-core-618298:4329953"))
+    runtimeOnly( fg.deobf("curse.maven:sophisticated-backpacks-422301:4329957"))
 }
 
 tasks.named("compileKotlin") {
diff --git a/platforms/forge-1.19/src/main/resources/assets/inventoryprofilesnext/config/rules.txt b/platforms/forge-1.19/src/main/resources/assets/inventoryprofilesnext/config/rules.txt
@@ -30,3 +30,9 @@
 
 @auto_refill_best
     @default_nbt_rule
+
+@accumulated_count_descending
+    ::accumulated_count(number_order = descending)
+
+@accumulated_count_ascending
+    ::accumulated_count(number_order = ascending)
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/config/ConfigEnums.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/config/ConfigEnums.kt
@@ -31,6 +31,8 @@ enum class SortingMethod(val ruleName: String?) {
     ITEM_NAME("item_name"),
     ITEM_ID("item_id"),
     RAW_ID("raw_id"),
+    ACCUMULATED_COUNT_DESCENDING("accumulated_count_descending"),
+    ACCUMULATED_COUNT_ASCENDING("accumulated_count_ascending"),
     CUSTOM(null);
 
     override fun toString(): String =
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/input/InventoryInputHandler.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/input/InventoryInputHandler.kt
@@ -34,8 +34,8 @@ object InventoryInputHandler : IInputHandler {
     override fun onInput(lastKey: Int,
                          lastAction: Int): Boolean {
         if (!VanillaUtil.inGame()) return false
-        val scr = Vanilla.screen();
-        val ctr = Vanilla.container();
+        val scr = Vanilla.screen()
+        val ctr = Vanilla.container()
         if (scr != null && scr is ContainerScreen<*> ) {
             val screenHints = HintsManagerNG.getHints(scr.javaClass)
             val containerHints = HintsManagerNG.getHints(ctr.javaClass)
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/AdvancedContainer.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/AdvancedContainer.kt
@@ -100,6 +100,7 @@ class AdvancedContainer(private val vanillaContainer: Container,
 
         val sandboxTracker: ItemTracker
             get() = sandbox.items
+
         val ItemArea.asSubTracker: SubTracker
             get() = sandboxTracker.subTracker(this.slotIndices)
     }
@@ -111,6 +112,7 @@ class AdvancedContainer(private val vanillaContainer: Container,
     }
 
     open inner class AdvancedContainerDsl {
+
         fun AreaType.get(): ItemArea {
             return getItemArea(vanillaContainer,
                                vanillaSlots)
@@ -135,10 +137,12 @@ class AdvancedContainer(private val vanillaContainer: Container,
     companion object {
 
         fun create(): AdvancedContainer {
-            return when (val container = Vanilla.container()) {
-                is CreativeContainer -> Vanilla.playerContainer()
-                else                 -> container
-            }.let { AdvancedContainer(it) }
+            val container = Vanilla.container()
+            return AdvancedContainer(if (container is CreativeContainer) {
+                Vanilla.playerContainer()
+            } else {
+                container
+            })
         }
 
         inline operator fun invoke(instant: Boolean = false,
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/GeneralInventoryActions.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/GeneralInventoryActions.kt
@@ -370,8 +370,8 @@ private object InnerActions {
 
     fun doSort(sortingRule: Rule,
                postAction: PostAction) = tryCatch {
-            innerDoSort(sortingRule,
-                        postAction)
+        innerDoSort(sortingRule,
+                    postAction)
     }
 
     fun innerDoSort(sortingRule: Rule,
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/sandbox/diffcalculator/ScoreBasedDualDiffCalculatorInstance.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/sandbox/diffcalculator/ScoreBasedDualDiffCalculatorInstance.kt
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/sandbox/diffcalculator/SimpleDiffCalculatorInstance.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/inventory/sandbox/diffcalculator/SimpleDiffCalculatorInstance.kt
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/ItemStack.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/ItemStack.kt
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/ItemType.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/ItemType.kt
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/rule/Rule.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/rule/Rule.kt
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/rule/natives/DefinedNativeRules.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/item/rule/natives/DefinedNativeRules.kt
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/util/Bucket.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/util/Bucket.kt
diff --git a/shared-sources/src/main/resources/assets/inventoryprofilesnext/lang/en_us.json b/shared-sources/src/main/resources/assets/inventoryprofilesnext/lang/en_us.json
diff --git a/shared-sources/src/main/resources/assets/inventoryprofilesnext/lang/uk_ua.json b/shared-sources/src/main/resources/assets/inventoryprofilesnext/lang/uk_ua.json

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`package org.anti_ad.mc.ipnext.compat.integrations`
`21`	`21`
`22`	`22`	`import org.anti_ad.mc.common.extensions.trySwallow`
	`23`	`+import org.anti_ad.mc.common.vanilla.alias.Slot`
`23`	`24`
`24`	`25`	`object Integrations {`
`25`	`26`
`@@ -31,9 +32,14 @@ object Integrations {`
`31`	`32`	`}`
`32`	`33`
`33`	`34`
	`35`	`+ var ___getSophisticatedMaxCount: (Slot) -> Int = { -1 }`
	`36`	`+`
	`37`	`+`
`34`	`38`	`fun init() {`
`35`	`39`	`trySwallow {`
`36`	`40`	`CarpetIntegration().init()`
`37`	`41`	`}`
`38`	`42`	`}`
	`43`	`+`
	`44`	`+ fun sophisticatedMaxCount(sourceSlot: Slot): Int = ___getSophisticatedMaxCount(sourceSlot)`
`39`	`45`	`}`