fix locked container preview persisting when the itemstack changes

Author: beanbag44

src/main/java/com/lambda/mixin/render/DrawContextMixin.java

@@ -88,7 +88,6 @@ private void injectDrawMap(TextRenderer textRenderer, ItemStack stack, int i, in
     @Inject(method = "drawTooltip(Lnet/minecraft/client/font/TextRenderer;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/util/Identifier;)V", at = @At("HEAD"), cancellable = true)
     private void onDrawTooltip(TextRenderer textRenderer, List<Text> text, Optional<TooltipData> data, int x, int y, @Nullable Identifier texture, CallbackInfo ci) {
         if (!ContainerPreview.INSTANCE.isEnabled()) return;
-
         if (ContainerPreview.isRenderingSubTooltip()) return;
 
         if (ContainerPreview.isLocked()) {
@@ -97,9 +96,9 @@ private void onDrawTooltip(TextRenderer textRenderer, List<Text> text, Optional<
             return;
         }
 
-        if (data.isPresent() && data.get() instanceof ContainerPreview.ContainerComponent component) {
+        if (data.isPresent()) {
             ci.cancel();
-            ContainerPreview.renderShulkerTooltip((DrawContext)(Object)this, textRenderer, component, x, y);
+            ContainerPreview.renderShulkerTooltip((DrawContext)(Object)this, textRenderer, x, y);
         }
     }
 }

src/main/kotlin/com/lambda/command/commands/PrefixCommand.kt

@@ -52,6 +52,7 @@ object PrefixCommand : LambdaCommand(
 				}
 				val prefixChar = prefix.first()
 				val configurable = Configuration.configurableByName("command") ?: return@executeWithResult failure("No command configurable found.")
+				@Suppress("UNCHECKED_CAST")
 				val setting = configurable.settings.find { it.name == "prefix" } as? Setting<*, Char>
 					?: return@executeWithResult failure("Prefix setting is not a Char or can not be found.")
 				setting.trySetValue(prefixChar)

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

@@ -60,7 +60,7 @@ class MutableAutomationConfigImpl : MutableAutomationConfig {
 						if (setting.core.type != newSetting.core.type)
 							throw IllegalStateException("Settings with the same name do not have the same type.")
 						@Suppress("UNCHECKED_CAST")
-						(setting as Setting<SettingCore<*>, Any>).core = newSetting.core as SettingCore<Any>
+						(setting as Setting<SettingCore<Any>, Any>).core = newSetting.core as SettingCore<Any>
 					}
 				}
 			}

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

@@ -45,7 +45,7 @@ interface Contextual : ComparableResult<Rank> {
                 if (it is InteractContext) it.cachedState.fluidState.level
                 else Int.MIN_VALUE
             }.thenByDescending {
-                it.cachedState.block != Blocks.OBSERVER
+                it.expectedState.block != Blocks.OBSERVER
             }.thenByDescending {
                 context.sorter == ActionConfig.SortMode.Tool && it.hotbarIndex == HotbarManager.serverSlot
             }.thenBy {

src/main/kotlin/com/lambda/module/modules/render/ContainerPreview.kt

@@ -22,6 +22,8 @@ import com.lambda.config.settings.complex.Bind
 import com.lambda.interaction.material.container.containers.EnderChestContainer
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import com.lambda.threading.runSafe
+import com.lambda.util.InputUtils.isSatisfied
 import com.lambda.util.KeyCode
 import com.lambda.util.item.ItemStackUtils.shulkerBoxContents
 import com.lambda.util.item.ItemUtils.shulkerBoxes
@@ -30,13 +32,14 @@ import net.minecraft.client.font.TextRenderer
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.tooltip.TooltipComponent
 import net.minecraft.client.gl.RenderPipelines
+import net.minecraft.client.gui.screen.ingame.HandledScreen
 import net.minecraft.item.BlockItem
 import net.minecraft.item.ItemStack
 import net.minecraft.item.Items
 import net.minecraft.item.tooltip.TooltipData
+import net.minecraft.screen.slot.Slot
 import net.minecraft.util.DyeColor
 import net.minecraft.util.Identifier
-import org.lwjgl.glfw.GLFW
 
 object ContainerPreview : Module(
     name = "ContainerPreview",
@@ -48,7 +51,12 @@ object ContainerPreview : Module(
 
     private val background = Identifier.ofVanilla("textures/gui/container/shulker_box.png")
 
+    private var lockedSlot: Slot? = null
     private var lockedStack: ItemStack? = null
+        set(value) {
+            if (value !== field) lockedSlot = null
+            field = value
+        }
     private var lockedX: Int = 0
     private var lockedY: Int = 0
 
@@ -64,14 +72,7 @@ object ContainerPreview : Module(
 
     @JvmStatic
     val isLocked: Boolean
-        get() = lockedStack != null
-
-    @JvmStatic
-    fun isLockKeyPressed(): Boolean {
-        if (!isEnabled) return false
-        val handle = mc.window.handle
-        return GLFW.glfwGetKey(handle, lockKey.key) == GLFW.GLFW_PRESS
-    }
+        get() = lockedSlot != null
 
     private fun getTooltipWidth() = PADDING + COLS * SLOT_SIZE + PADDING
     private fun getTooltipHeight() = TITLE_HEIGHT + ROWS * SLOT_SIZE + PADDING
@@ -104,38 +105,41 @@ object ContainerPreview : Module(
     fun renderShulkerTooltip(
 	    context: DrawContext,
 	    textRenderer: TextRenderer,
-	    component: ContainerComponent,
 	    mouseX: Int,
 	    mouseY: Int
-	) {
+	) = runSafe {
+        val handledScreen = mc.currentScreen as? HandledScreen<*> ?: return@runSafe
+        val slot = handledScreen.focusedSlot ?: return@runSafe
+
         val width = getTooltipWidth()
         val height = getTooltipHeight()
 
-        val lockKeyPressed = isLockKeyPressed()
+        val lockKeyPressed = lockKey.isSatisfied()
 
-        if (lockKeyPressed && lockedStack == null) {
-            lockedStack = component.stack.copy()
+        if (lockKeyPressed && lockedSlot == null) {
+            lockedSlot = slot
             lockedX = calculateTooltipX(mouseX, width)
             lockedY = calculateTooltipY(mouseY, height)
-        } else if (!lockKeyPressed && lockedStack != null) {
-            lockedStack = null
+        } else if (!lockKeyPressed && lockedSlot != null) {
+            lockedSlot = null
         }
 
         if (isLocked) {
             renderLockedTooltipInternal(context, textRenderer)
-            return
+            return@runSafe
         }
 
-        renderTooltipForStack(context, textRenderer, component.stack, calculateTooltipX(mouseX, width), calculateTooltipY(mouseY, height), false)
+        renderTooltipForStack(context, textRenderer, slot.stack, calculateTooltipX(mouseX, width), calculateTooltipY(mouseY, height), false)
     }
 
     /**
      * Render the locked tooltip - called from mixin when we're locked
      */
     @JvmStatic
     fun renderLockedTooltip(context: DrawContext, textRenderer: TextRenderer) {
-        if (!isLockKeyPressed()) {
-            lockedStack = null
+        lockedStack = lockedSlot?.stack
+        if (!lockKey.isSatisfied() || lockedSlot?.stack?.isEmpty == true) {
+            lockedSlot = null
             return
         }
         renderLockedTooltipInternal(context, textRenderer)