Fix: Hotbar tools, shulker boxes and drops (#353)

Author: blocksimus

src/main/kotlin/com/lambda/Lambda.kt

@@ -17,7 +17,6 @@
 
 package com.lambda
 
-import com.lambda.Lambda.mapper
 import com.lambda.config.Deserializer
 import com.lambda.config.FallbackDeserializer
 import com.lambda.config.FallbackSerializer

src/main/kotlin/com/lambda/config/ConfigCategory.kt

@@ -25,7 +25,6 @@ import com.lambda.config.migration.ConfigMigrationHandler
 import com.lambda.core.Loadable
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
-import com.lambda.interaction.handler.handlers.BaritoneHandler.primary
 import com.lambda.threading.runIO
 import com.lambda.util.CommunicationUtils.info
 import com.lambda.util.CommunicationUtils.logError

src/main/kotlin/com/lambda/config/categories/ModuleCategory.kt

@@ -18,7 +18,6 @@
 package com.lambda.config.categories
 
 import com.lambda.config.ConfigCategory
-import com.lambda.config.categories.ModuleCategory.name
 import com.lambda.util.FolderRegistry
 import java.io.File
 

src/main/kotlin/com/lambda/config/serializers/EnderChestContainerSerializer.kt

@@ -84,7 +84,7 @@ object EnderChestContainerDeserializer : Deserializer<EnderChestContainer>(Ender
             } else decodedStacks
 
         EnderChestContainer.update(stacks)
-        EnderChestContainer.scanStacksForNestedContainers()
+        EnderChestContainer.scanContainerContents()
         return EnderChestContainer
     }
 }

src/main/kotlin/com/lambda/config/serializers/PlacedContainerSerializer.kt

@@ -125,7 +125,7 @@ object PlacedContainerDeserializer : FallbackDeserializer<PlacedContainer>(Place
                 else -> return null
             }
 
-        container.scanStacksForNestedContainers()
+        container.scanContainerContents()
         return container
     }
 }

src/main/kotlin/com/lambda/event/EventFlow.kt

@@ -18,11 +18,6 @@
 package com.lambda.event
 
 import com.lambda.context.SafeContext
-import com.lambda.event.EventFlow.concurrentFlow
-import com.lambda.event.EventFlow.concurrentListeners
-import com.lambda.event.EventFlow.lambdaScope
-import com.lambda.event.EventFlow.post
-import com.lambda.event.EventFlow.syncListeners
 import com.lambda.event.callback.ICancellable
 import com.lambda.event.listener.Listener
 import com.lambda.threading.runConcurrent

src/main/kotlin/com/lambda/event/listener/UnsafeListener.kt

@@ -21,9 +21,6 @@ import com.lambda.context.SafeContext
 import com.lambda.event.Event
 import com.lambda.event.EventFlow
 import com.lambda.event.Muteable
-import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.event.listener.SafeListener.Companion.listenConcurrently
-import com.lambda.event.listener.SafeListener.Companion.listenOnce
 import com.lambda.threading.runConcurrent
 import com.lambda.util.Pointer
 import com.lambda.util.collections.updatable

src/main/kotlin/com/lambda/gui/dsl/ImGuiBuilder.kt

@@ -20,10 +20,6 @@
 package com.lambda.gui.dsl
 
 import com.lambda.gui.components.ClickGuiLayout
-import com.lambda.gui.dsl.ImGuiBuilder.onItemClick
-import com.lambda.gui.dsl.ImGuiBuilder.onItemHover
-import com.lambda.gui.dsl.ImGuiBuilder.openPopup
-import com.lambda.gui.dsl.ImGuiBuilder.text
 import com.lambda.imgui.ImDrawList
 import com.lambda.imgui.ImFont
 import com.lambda.imgui.ImGui

src/main/kotlin/com/lambda/interaction/construction/simulation/result/results/GenericResult.kt

@@ -31,7 +31,6 @@ import com.lambda.interaction.container.selection.StackSelection
 import com.lambda.interaction.container.selection.select
 import com.lambda.interaction.handler.handlers.BaritoneHandler
 import com.lambda.task.tasks.transfer
-import net.minecraft.client.data.TextureMap.side
 import net.minecraft.item.ItemStack
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box

src/main/kotlin/com/lambda/interaction/construction/simulation/sims/InteractSim.kt

@@ -208,6 +208,9 @@ class InteractSim internal constructor(simInfo: InteractSimInfo)
 				countEmptyAsOne()
 				alwaysWholeStacks()
 				item?.let { isItem(it) }
+				(targetState as? TargetState.Stack)?.let { target ->
+					sortedWith { compareByDescending { it.stack === target.itemStack } }
+				}
 				sortedWith { compareByDescending { it.slot?.index == player.inventory.selectedSlot } }
 			}