more disable user input for locked slots.

blackd · blackd · commit 1819ae2e9193 · 2023-06-16T22:18:57.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ import org.anti_ad.mc.ipnext.buildsrc.loom_version
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.ByteArrayOutputStream
 
-val versionObj = Version("1", "10", "3",
+val versionObj = Version("1", "10", "4",
                          preRelease = (System.getenv("IPNEXT_RELEASE") == null))
 
 
diff --git a/changelog.md b/changelog.md
@@ -1,10 +1,9 @@
 <!-- latest begin -->
 
-### 1.10.3
+### 1.10.4
 
-- Support for 1.20 Fabric. The pre1/2 version does work but has some GUI glitches.
-- Fixed default sort rule for 1.19.4 and 1.20 to really use the Creative search tab index.
-- Fixed a problem where the bookmark buttons didn't work last 1 or 2 trades.
+- "Disable all input user for locked slots" now disables and swap buttons (1-9)
+- Forge 1.20.1 support
 
 ### WARNING
 
@@ -21,10 +20,17 @@ Any problems that are not reproducible on Fabric will be addressed with very low
 - **1.19.2**
 - **1.19.4**
 - **1.20**
+- **1.20.1**
 
 <!-- latest end -->
 <!-- rest begin -->
 
+### 1.10.3
+
+- Support for 1.20 Fabric. The pre1/2 version does work but has some GUI glitches.
+- Fixed default sort rule for 1.19.4 and 1.20 to really use the Creative search tab index.
+- Fixed a problem where the bookmark buttons didn't work last 1 or 2 trades.
+
 ### 1.10.2
 
 - Sorry for the torrent of updates but somehow the last released end up build from 1.10.1 sources
diff --git a/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java b/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java
@@ -66,11 +66,12 @@ public void onForegroundRender(MatrixStack matrixStack, int i, int j, float f, C
     public void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (actionType == SlotActionType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(button))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/fabric-1.18.2/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java b/platforms/fabric-1.18.2/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java
@@ -67,11 +67,12 @@ public void onForegroundRender(MatrixStack matrixStack, int i, int j, float f, C
     public void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (actionType == SlotActionType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(button))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/fabric-1.19.4/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java b/platforms/fabric-1.19.4/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java
@@ -67,11 +67,12 @@ public void onForegroundRender(MatrixStack matrixStack, int i, int j, float f, C
     public void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (actionType == SlotActionType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(button))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/fabric-1.19/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java b/platforms/fabric-1.19/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java
@@ -67,11 +67,12 @@ public void onForegroundRender(MatrixStack matrixStack, int i, int j, float f, C
     public void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (actionType == SlotActionType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(button))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/fabric-1.20/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java b/platforms/fabric-1.20/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinContainerScreen.java
@@ -49,15 +49,17 @@ protected MixinContainerScreen(Text text) {
     }
 
     @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;" +
-            "drawBackground(Lnet/minecraft/client/gui/DrawContext;FII)V", shift = At.Shift.AFTER), method = "render")
+            "drawBackground(Lnet/minecraft/client/gui/DrawContext;FII)V",
+            shift = At.Shift.AFTER), method = "render")
     public void onBackgroundRender(DrawContext drawContext, int i, int j, float f, CallbackInfo ci) {
         ContainerScreenEventHandler.INSTANCE.onBackgroundRender(new NativeContext(drawContext), i, j);
     }
 
 
 
     @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;" +
-            "drawForeground(Lnet/minecraft/client/gui/DrawContext;II)V", shift = At.Shift.AFTER), method = "render")
+            "drawForeground(Lnet/minecraft/client/gui/DrawContext;II)V",
+            shift = At.Shift.AFTER), method = "render")
     public void onForegroundRender(DrawContext drawContext, int i, int j, float f, CallbackInfo ci) {
         var context = new NativeContext(drawContext);
         context.setOverlay(true);
@@ -72,11 +74,12 @@ public void onForegroundRender(DrawContext drawContext, int i, int j, float f, C
     public void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (actionType == SlotActionType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(button))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/forge-1.16/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java b/platforms/forge-1.16/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java
@@ -42,11 +42,12 @@ public class MixinAbstractContainerScreen<T extends Container> {
     protected void slotClicked(Slot slot, int slotId, int p_97780_, ClickType p_97781_, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (p_97781_ == ClickType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(p_97780_))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/forge-1.18.2/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java b/platforms/forge-1.18.2/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java
@@ -57,11 +57,12 @@ protected void slotClicked(Slot slot, int slotId, int p_97780_, ClickType p_9778
             //Log.INSTANCE.trace("from here:", new Throwable());
         }
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (p_97781_ == ClickType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(p_97780_))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/forge-1.19.4/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java b/platforms/forge-1.19.4/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java
@@ -42,11 +42,12 @@ public class MixinAbstractContainerScreen<T extends AbstractContainerMenu> {
     protected void slotClicked(Slot slot, int slotId, int p_97780_, ClickType p_97781_, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (p_97781_ == ClickType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(p_97780_))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/forge-1.19/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java b/platforms/forge-1.19/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java
@@ -42,13 +42,14 @@ public class MixinAbstractContainerScreen<T extends AbstractContainerMenu> {
     protected void slotClicked(Slot slot, int slotId, int p_97780_, ClickType p_97781_, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (p_97781_ == ClickType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(p_97780_))) {
             Log.INSTANCE.trace("cancel for " + slotId);
             ci.cancel();
         }
     }
+    }
 
     @Inject(at = @At(value = "TAIL",
             target = "Lnet/minecraft/client/gui/screens/inventory/AbstractContainerScreen;slotClicked(Lnet/minecraft/world/inventory/Slot;IILnet/minecraft/world/inventory/ClickType;)V"),
diff --git a/platforms/forge-1.20/build.gradle.kts b/platforms/forge-1.20/build.gradle.kts
@@ -35,16 +35,16 @@ import org.anti_ad.mc.ipnext.buildsrc.registerMinimizeJarTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import proguard.gradle.ProGuardTask
 
-val supported_minecraft_versions = listOf("1.20")
+val supported_minecraft_versions = listOf("1.20.1")
 val mod_loader = "forge"
 val mod_version = project.version
-val minecraft_version = "1.20"
-val minecraft_version_string = "1.20"
-val forge_version = "46.0.12"
+val minecraft_version = "1.20.1"
+val minecraft_version_string = "1.20.1"
+val forge_version = "47.0.1"
 val mod_artefact_version = project.ext["mod_artefact_version"]
 val kotlin_for_forge_version = "4.3.0"
 val mappingsMap = mapOf("channel" to "official",
-                        "version" to "1.20")
+                        "version" to "1.20.1")
 val libIPN_version = "${project.name}:${project.ext["libIPN_version"]}"
 
 logger.lifecycle("""
diff --git a/platforms/forge-1.20/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java b/platforms/forge-1.20/src/main/java/org/anti_ad/mc/ipnext/mixin/MixinAbstractContainerScreen.java
@@ -42,11 +42,12 @@ public class MixinAbstractContainerScreen<T extends AbstractContainerMenu> {
     protected void slotClicked(Slot slot, int slotId, int p_97780_, ClickType p_97781_, CallbackInfo ci) {
         Log.INSTANCE.trace("onMouseClick for " + slotId);
         LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);
-        if (slot != null
-                && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()
-                && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {
-            Log.INSTANCE.trace("cancel for " + slotId);
-            ci.cancel();
+        if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {
+            if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) ||
+                    (p_97781_ == ClickType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(p_97780_))) {
+                Log.INSTANCE.trace("cancel for " + slotId);
+                ci.cancel();
+            }
         }
     }
 
diff --git a/platforms/forge-1.20/src/main/resources/META-INF/mods.toml b/platforms/forge-1.20/src/main/resources/META-INF/mods.toml
@@ -52,7 +52,7 @@ Take controll over you inventory
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[46,47)" #mandatory
+    versionRange="[46,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,19 +21,17 @@
 rootProject.name = "InventoryProfilesNext"
 
 
-/*include("platforms:fabric-1.20")
+include("platforms:fabric-1.20")
 include("platforms:fabric-1.19.4")
 include("platforms:fabric-1.19")
 include("platforms:fabric-1.18.2")
-include("platforms:fabric-1.16")*/
+include("platforms:fabric-1.16")
 
 include("platforms:forge-1.20")
-/*
 include("platforms:forge-1.19.4")
 include("platforms:forge-1.19")
 include("platforms:forge-1.18.2")
 include("platforms:forge-1.16")
-*/
 
 
 pluginManagement {
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/event/LockSlotsHandler.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/event/LockSlotsHandler.kt
@@ -47,6 +47,7 @@ import org.anti_ad.mc.ipnext.config.ModSettings
 import org.anti_ad.mc.ipnext.config.SwitchType.HOLD
 import org.anti_ad.mc.ipnext.config.SwitchType.TOGGLE
 import org.anti_ad.mc.ipnext.ingame.`(containerBounds)`
+import org.anti_ad.mc.ipnext.ingame.`(id)`
 import org.anti_ad.mc.ipnext.ingame.`(invSlot)`
 import org.anti_ad.mc.ipnext.ingame.`(inventoryOrNull)`
 import org.anti_ad.mc.ipnext.ingame.`(itemStack)`
@@ -57,6 +58,7 @@ import org.anti_ad.mc.ipnext.ingame.`(slots)`
 import org.anti_ad.mc.ipnext.ingame.`(topLeft)`
 import org.anti_ad.mc.ipnext.ingame.`(window)`
 import org.anti_ad.mc.ipnext.ingame.vPlayerSlotOf
+import org.anti_ad.mc.ipnext.inventory.AreaTypes
 import org.anti_ad.mc.ipnext.item.maxCount
 
 import org.anti_ad.mc.ipnext.parser.LockSlotsLoader
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/event/villagers/Config.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/event/villagers/Config.kt
@@ -44,17 +44,22 @@ data class Config(val globalBookmarks: MutableMap<String, MutableList<VillagerTr
 
     fun clear() {
         synchronized(sync) {
+            isDirty = globalBookmarks.isNotEmpty() || localBookmarks.isNotEmpty()
             globalBookmarks.clear()
             localBookmarks.clear()
         }
     }
 
     fun markDirty() {
-        this.isDirty = true
+        synchronized(sync) {
+            this.isDirty = true
+        }
     }
 
     fun cleanDirty() {
-        this.isDirty = false
+        synchronized(sync) {
+            this.isDirty = false
+        }
     }
 
     fun asSanitized(): Config {
diff --git a/shared-sources/src/main/java/org/anti_ad/mc/ipnext/event/villagers/VillagerDataManager.kt b/shared-sources/src/main/java/org/anti_ad/mc/ipnext/event/villagers/VillagerDataManager.kt
@@ -57,8 +57,8 @@ object VillagerDataManager {
     private lateinit var configFile: Path;
 
     private fun add(target: MutableMap<String, MutableList<VillagerTradeData>>,
-            key: String,
-            data: VillagerTradeData) {
+                    key: String,
+                    data: VillagerTradeData) {
         target.getOrPut(key) {
             mutableListOf()
         }.add(data)
@@ -156,6 +156,7 @@ object VillagerDataManager {
                     val cfg = config.asSanitized()
                     if (cfg.isDirty) {
                         save(cfg)
+                        config.cleanDirty()
                     } else if (++timesEmpty > maxTimesEmpty) {
                         cancel()
                     }
@@ -192,8 +193,10 @@ object VillagerDataManager {
             json.encodeToStream(Config.serializer(),
                                 cfg,
                                 this)
+            this.flush()
+            this.close()
         }
-        config.cleanDirty()
+
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,12 @@ protected void slotClicked(Slot slot, int slotId, int p_97780_, ClickType p_9778`
`57`	`57`	`//Log.INSTANCE.trace("from here:", new Throwable());`
`58`	`58`	`}`
`59`	`59`	`LockSlotsHandler.INSTANCE.setLastMouseClickSlot(slot);`
`60`		`- if (slot != null`
`61`		`- && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()`
`62`		`- && LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot)) {`
`63`		`- Log.INSTANCE.trace("cancel for " + slotId);`
`64`		`- ci.cancel();`
	`60`	`+ if (slot != null && LockedSlotsSettings.INSTANCE.getLOCK_SLOTS_DISABLE_USER_INTERACTION().getValue()) {`
	`61`	`+ if (LockSlotsHandler.INSTANCE.isMappedSlotLocked(slot) \|\|`
	`62`	`+ (p_97781_ == ClickType.SWAP && LockSlotsHandler.INSTANCE.isSlotLocked(p_97780_))) {`
	`63`	`+ Log.INSTANCE.trace("cancel for " + slotId);`
	`64`	`+ ci.cancel();`
	`65`	`+ }`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`