small cleanup

Author: beanbag44

src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt

@@ -17,7 +17,6 @@
 
 package com.lambda.interaction.material.container
 
-import com.lambda.context.Automated
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
@@ -113,19 +112,18 @@ object ContainerManager : Loadable {
     ): MaterialContainer? = findContainersWithMaterial(containerSelection).firstOrNull()
 
     context(automatedSafeContext: AutomatedSafeContext)
-    fun StackSelection.findContainerWithSpace(
-        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection
-    ): MaterialContainer? =
-        findContainersWithSpace(containerSelection).firstOrNull()
-
-    context(automated: Automated, safeContext: SafeContext)
     fun StackSelection.findContainersWithMaterial(
-        containerSelection: ContainerSelection = automated.inventoryConfig.containerSelection,
+        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection,
     ): List<MaterialContainer> =
         containers()
             .filter { containerSelection.matches(it) }
             .filter { it.materialAvailable(this) >= count }
-            .sortedWith(automated.inventoryConfig.providerPriority.materialComparator(this))
+            .sortedWith(automatedSafeContext.inventoryConfig.providerPriority.materialComparator(this))
+
+    context(automatedSafeContext: AutomatedSafeContext)
+    fun StackSelection.findContainerWithSpace(
+        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection
+    ): MaterialContainer? = findContainersWithSpace(containerSelection).firstOrNull()
 
     context(automatedSafeContext: AutomatedSafeContext)
     fun StackSelection.findContainersWithSpace(
@@ -136,6 +134,11 @@ object ContainerManager : Loadable {
             .filter { it.spaceAvailable(this) >= count }
             .sortedWith(automatedSafeContext.inventoryConfig.providerPriority.spaceComparator(this))
 
+    context(automatedSafeContext: AutomatedSafeContext)
+    fun StackSelection.findSlotWithMaterial(
+        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection
+    ) = findSlotsWithMaterial(containerSelection).firstOrNull()
+
     context(automatedSafeContext: AutomatedSafeContext)
     fun StackSelection.findSlotsWithMaterial(
         containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection

src/main/kotlin/com/lambda/interaction/material/container/MaterialContainer.kt

@@ -63,6 +63,8 @@ abstract class MaterialContainer(
         !it.stack.item.components.contains(DataComponentTypes.TOOL)
     }.thenByDescending {
         !it.stack.item.components.contains(DataComponentTypes.FOOD)
+    }.thenByDescending {
+        !it.stack.item.components.contains(DataComponentTypes.CONSUMABLE)
     }.thenByDescending {
         it.stack.isStackable
     }