feat: allow locking bound slots

Author: lineargraph

src/main/kotlin/events/IsSlotProtectedEvent.kt

@@ -21,8 +21,10 @@ data class IsSlotProtectedEvent(
 	val itemStack get() = itemStackOverride ?: slot!!.item
 
 	fun protect() {
+		if (!isProtected) {
+			silent = false
+		}
 		isProtected = true
-		silent = false
 	}
 
 	fun protectSilent() {
@@ -55,7 +57,7 @@ data class IsSlotProtectedEvent(
 					            .red()
 					            .append(tr("firmament.protectitem.hoverhint", "Hover for more info.").grey())
 					            .hover(tr("firmament.protectitem.hint",
-					                      "To unlock this item use the Lock Slot or Lock Item keybind from Firmament while hovering over this item.")))
+					                      "To unlock this item use the Lock Slot or Lock Item keybind from Firmament while hovering over this item. If this is a bound slot, you can use disable the Lock Bound Slots setting.")))
 				CommonSoundEffects.playFailure()
 			}
 			return event.isProtected

src/main/kotlin/features/inventory/SlotLocking.kt

@@ -150,6 +150,7 @@ object SlotLocking {
 			SavedKeyBinding.keyWithMods(GLFW.GLFW_KEY_L, InputModifiers.of(shift = true))
 		}
 		val slotBind by keyBinding("bind") { GLFW.GLFW_KEY_L }
+		val lockBound by toggle("lock-bind") { false }
 		val slotBindRequireShift by toggle("require-quick-move") { true }
 		val slotRenderLines by choice("bind-render") { SlotRenderLinesMode.ONLY_BOXES }
 		val slotBindOnlyInInv by toggle("bind-only-in-inv") { false }
@@ -254,7 +255,14 @@ object SlotLocking {
 
 	@Subscribe
 	fun onProtectSlot(it: IsSlotProtectedEvent) {
-		if (it.slot != null && it.slot.container is Inventory && it.slot.containerSlot in (lockedSlots ?: setOf())) {
+		if (it.slot != null
+			&& it.slot.container is Inventory
+			&& (it.slot.containerSlot in (lockedSlots ?: setOf())
+				|| (
+				TConfig.lockBound &&
+					currentWorldData.boundSlots.findMatchingSlots(it.slot.containerSlot).isNotEmpty())
+				)
+		) {
 			it.protect()
 		}
 	}

translations/en_us.json

@@ -396,6 +396,8 @@
 	"firmament.config.slot-locking.hunting-box": "Protect Hunting Box",
 	"firmament.config.slot-locking.hunting-box.description": "The Hunting Box frequently changes its UUID, and as such cannot be reliably protected using UUID locking. Instead this option can be used to block from dropping any Hunting Box.",
 	"firmament.config.slot-locking.lock": "Lock Slot",
+	"firmament.config.slot-locking.lock-bind": "Lock Bound Slots",
+	"firmament.config.slot-locking.lock-bind.description": "Prevent moving bound slots, except for slot quick moving.",
 	"firmament.config.slot-locking.lock-uuid": "Lock UUID (Lock Item)",
 	"firmament.config.slot-locking.lock-uuid.description": "Lock a SkyBlock item by it's UUID. This blocks a specific item from being dropped/sold, but still allows moving it around.",
 	"firmament.config.slot-locking.lock.description": "Lock a slot, preventing any item from being moved from, dropped from, or placed into this slot.",