Merge branch 'mc-1.21.3'

37 files changed, 1588 insertions, 361 deletions

diff --git a/src/main/kotlin/commands/Duration.kt b/src/main/kotlin/commands/Duration.kt
new file mode 100644
index 0000000..42f143d
--- /dev/null
+++ b/src/main/kotlin/commands/Duration.kt
@@ -0,0 +1,75 @@
+package moe.nea.firmament.commands
+
+import com.mojang.brigadier.StringReader
+import com.mojang.brigadier.arguments.ArgumentType
+import com.mojang.brigadier.context.CommandContext
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType
+import com.mojang.brigadier.suggestion.Suggestions
+import com.mojang.brigadier.suggestion.SuggestionsBuilder
+import java.util.concurrent.CompletableFuture
+import java.util.function.Function
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+import moe.nea.firmament.util.tr
+
+object DurationArgumentType : ArgumentType<Duration> {
+	val unknownTimeCode = DynamicCommandExceptionType { timeCode ->
+		tr("firmament.command-argument.duration.error",
+		   "Unknown time code '$timeCode'")
+	}
+
+	override fun parse(reader: StringReader): Duration {
+		val start = reader.cursor
+		val string = reader.readUnquotedString()
+		val matcher = regex.matcher(string)
+		var s = 0
+		var time = 0.seconds
+		fun createError(till: Int) {
+			throw unknownTimeCode.createWithContext(
+				reader.also { it.cursor = start + s },
+				string.substring(s, till))
+		}
+
+		while (matcher.find()) {
+			if (matcher.start() != s) {
+				createError(matcher.start())
+			}
+			s = matcher.end()
+			val amount = matcher.group("count").toDouble()
+			val what = timeSuffixes[matcher.group("what").single()]!!
+			time += amount.toDuration(what)
+		}
+		if (string.length != s) {
+			createError(string.length)
+		}
+		return time
+	}
+
+
+	override fun <S : Any?> listSuggestions(
+		context: CommandContext<S>,
+		builder: SuggestionsBuilder
+	): CompletableFuture<Suggestions> {
+		val remaining = builder.remainingLowerCase.substringBefore(' ')
+		if (remaining.isEmpty()) return super.listSuggestions(context, builder)
+		if (remaining.last().isDigit()) {
+			for (timeSuffix in timeSuffixes.keys) {
+				builder.suggest(remaining + timeSuffix)
+			}
+		}
+		return builder.buildFuture()
+	}
+
+	val timeSuffixes = mapOf(
+		'm' to DurationUnit.MINUTES,
+		's' to DurationUnit.SECONDS,
+		'h' to DurationUnit.HOURS,
+	)
+	val regex = "(?<count>[0-9]+)(?<what>[${timeSuffixes.keys.joinToString("")}])".toPattern()
+
+	override fun getExamples(): Collection<String> {
+		return listOf("3m", "20s", "1h45m")
+	}
+}
diff --git a/src/main/kotlin/events/PartyMessageReceivedEvent.kt b/src/main/kotlin/events/PartyMessageReceivedEvent.kt
new file mode 100644
index 0000000..4688dfe
--- /dev/null
+++ b/src/main/kotlin/events/PartyMessageReceivedEvent.kt
@@ -0,0 +1,9 @@
+package moe.nea.firmament.events
+
+data class PartyMessageReceivedEvent(
+	val from: ProcessChatEvent,
+	val message: String,
+	val name: String,
+) : FirmamentEvent() {
+	companion object : FirmamentEventBus<PartyMessageReceivedEvent>()
+}
diff --git a/src/main/kotlin/features/chat/PartyCommands.kt b/src/main/kotlin/features/chat/PartyCommands.kt
new file mode 100644
index 0000000..de3a0d9
--- /dev/null
+++ b/src/main/kotlin/features/chat/PartyCommands.kt
@@ -0,0 +1,134 @@
+package moe.nea.firmament.features.chat
+
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.StringReader
+import com.mojang.brigadier.exceptions.CommandSyntaxException
+import com.mojang.brigadier.tree.LiteralCommandNode
+import kotlin.time.Duration.Companion.seconds
+import net.minecraft.util.math.BlockPos
+import moe.nea.firmament.annotations.Subscribe
+import moe.nea.firmament.commands.CaseInsensitiveLiteralCommandNode
+import moe.nea.firmament.commands.thenExecute
+import moe.nea.firmament.events.CommandEvent
+import moe.nea.firmament.events.PartyMessageReceivedEvent
+import moe.nea.firmament.events.ProcessChatEvent
+import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.ErrorUtil
+import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.TimeMark
+import moe.nea.firmament.util.tr
+import moe.nea.firmament.util.useMatch
+
+object PartyCommands {
+
+	val messageInChannel = "(?<channel>Party|Guild) >([^:]+?)? (?<name>[^: ]+): (?<message>.+)".toPattern()
+
+	@Subscribe
+	fun onChat(event: ProcessChatEvent) {
+		messageInChannel.useMatch(event.unformattedString) {
+			val channel = group("channel")
+			val message = group("message")
+			val name = group("name")
+			if (channel == "Party") {
+				PartyMessageReceivedEvent.publish(PartyMessageReceivedEvent(
+					event, message, name
+				))
+			}
+		}
+	}
+
+	val commandPrefixes = "!-?$.&#+~€\"@°_;:³²`'´ß\\,|".toSet()
+
+	data class PartyCommandContext(
+		val name: String
+	)
+
+	val dispatch = CommandDispatcher<PartyCommandContext>().also { dispatch ->
+		fun register(
+			name: String,
+			vararg alias: String,
+			block: CaseInsensitiveLiteralCommandNode.Builder<PartyCommandContext>.() -> Unit = {},
+		): LiteralCommandNode<PartyCommandContext> {
+			val node =
+				dispatch.register(CaseInsensitiveLiteralCommandNode.Builder<PartyCommandContext>(name).also(block))
+			alias.forEach { register(it) { redirect(node) } }
+			return node
+		}
+
+		register("warp", "pw", "pwarp", "partywarp") {
+			executes {
+				// TODO: add check if you are the party leader
+				MC.sendCommand("p warp")
+				0
+			}
+		}
+
+		register("transfer", "pt", "ptme") {
+			executes {
+				MC.sendCommand("p transfer ${it.source.name}")
+				0
+			}
+		}
+
+		register("allinvite", "allinv") {
+			executes {
+				MC.sendCommand("p settings allinvite")
+				0
+			}
+		}
+
+		register("coords") {
+			executes {
+				val p = MC.player?.blockPos ?: BlockPos.ORIGIN
+				MC.sendCommand("pc x: ${p.x}, y: ${p.y}, z: ${p.z}")
+				0
+			}
+		}
+		// TODO: downtime tracker (display message again at end of dungeon)
+		// instance ends: kuudra, dungeons, bacte
+		// TODO: at TPS command
+	}
+
+	object TConfig : ManagedConfig("party-commands", Category.CHAT) {
+		val enable by toggle("enable") { false }
+		val cooldown by duration("cooldown", 0.seconds, 20.seconds) { 2.seconds }
+		val ignoreOwnCommands by toggle("ignore-own") { false }
+	}
+
+	var lastCommand = TimeMark.farPast()
+
+	@Subscribe
+	fun listPartyCommands(event: CommandEvent.SubCommand) {
+		event.subcommand("partycommands") {
+			thenExecute {
+				// TODO: Better help, including descriptions and redirect detection
+				MC.sendChat(tr("firmament.partycommands.help", "Available party commands: ${dispatch.root.children.map { it.name }}. Available prefixes: $commandPrefixes"))
+			}
+		}
+	}
+
+	@Subscribe
+	fun onPartyMessage(event: PartyMessageReceivedEvent) {
+		if (!TConfig.enable) return
+		if (event.message.firstOrNull() !in commandPrefixes) return
+		if (event.name == MC.playerName && TConfig.ignoreOwnCommands) return
+		if (lastCommand.passedTime() < TConfig.cooldown) {
+			MC.sendChat(tr("firmament.partycommands.cooldown", "Skipping party command. Cooldown not passed."))
+			return
+		}
+		// TODO: add trust levels
+		val commandLine = event.message.substring(1)
+		try {
+			dispatch.execute(StringReader(commandLine), PartyCommandContext(event.name))
+		} catch (ex: Exception) {
+			if (ex is CommandSyntaxException) {
+				MC.sendChat(tr("firmament.partycommands.unknowncommand", "Unknown party command."))
+				return
+			} else {
+				MC.sendChat(tr("firmament.partycommands.unknownerror", "Unknown error during command execution."))
+				ErrorUtil.softError("Unknown error during command execution.", ex)
+			}
+		}
+		lastCommand = TimeMark.now()
+	}
+}
diff --git a/src/main/kotlin/features/chat/QuickCommands.kt b/src/main/kotlin/features/chat/QuickCommands.kt
index 5944b92..7963171 100644
--- a/src/main/kotlin/features/chat/QuickCommands.kt
+++ b/src/main/kotlin/features/chat/QuickCommands.kt
@@ -1,8 +1,12 @@
-
-
 package moe.nea.firmament.features.chat
 
+import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.context.CommandContext
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+import net.fabricmc.fabric.impl.command.client.ClientCommandInternals
+import net.minecraft.command.CommandRegistryAccess
+import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket
 import net.minecraft.text.Text
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.commands.DefaultSource
@@ -12,89 +16,139 @@ import moe.nea.firmament.commands.thenArgument
 import moe.nea.firmament.commands.thenExecute
 import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.features.FirmamentFeature
+import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.gui.config.ManagedOption
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SBData
+import moe.nea.firmament.util.grey
+import moe.nea.firmament.util.tr
 
 object QuickCommands : FirmamentFeature {
-    override val identifier: String
-        get() = "quick-commands"
+	override val identifier: String
+		get() = "quick-commands"
+
+	object TConfig : ManagedConfig("quick-commands", Category.CHAT) {
+		val enableJoin by toggle("join") { true }
+		val enableDh by toggle("dh") { true }
+		override fun onChange(option: ManagedOption<*>) {
+			reloadCommands()
+		}
+	}
+
+	fun reloadCommands() {
+		val lastPacket = lastReceivedTreePacket ?: return
+		val network = MC.networkHandler ?: return
+		val fallback = ClientCommandInternals.getActiveDispatcher()
+		try {
+			val dispatcher = CommandDispatcher<FabricClientCommandSource>()
+			ClientCommandInternals.setActiveDispatcher(dispatcher)
+			ClientCommandRegistrationCallback.EVENT.invoker()
+				.register(dispatcher, CommandRegistryAccess.of(network.combinedDynamicRegistries,
+				                                               network.enabledFeatures))
+			ClientCommandInternals.finalizeInit()
+			network.onCommandTree(lastPacket)
+		} catch (ex: Exception) {
+			ClientCommandInternals.setActiveDispatcher(fallback)
+			throw ex
+		}
+	}
+
+
+	fun removePartialPrefix(text: String, prefix: String): String? {
+		var lf: String? = null
+		for (i in 1..prefix.length) {
+			if (text.startsWith(prefix.substring(0, i))) {
+				lf = text.substring(i)
+			}
+		}
+		return lf
+	}
+
+	var lastReceivedTreePacket: CommandTreeS2CPacket? = null
 
-    fun removePartialPrefix(text: String, prefix: String): String? {
-        var lf: String? = null
-        for (i in 1..prefix.length) {
-            if (text.startsWith(prefix.substring(0, i))) {
-                lf = text.substring(i)
-            }
-        }
-        return lf
-    }
+	val kuudraLevelNames = listOf("NORMAL", "HOT", "BURNING", "FIERY", "INFERNAL")
+	val dungeonLevelNames = listOf("ONE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN")
 
-    val kuudraLevelNames = listOf("NORMAL", "HOT", "BURNING", "FIERY", "INFERNAL")
-    val dungeonLevelNames = listOf("ONE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN")
+	@Subscribe
+	fun registerDh(event: CommandEvent) {
+		if (!TConfig.enableDh) return
+		event.register("dh") {
+			thenExecute {
+				MC.sendCommand("warp dhub")
+			}
+		}
+		event.register("dn") {
+			thenExecute {
+				MC.sendChat(tr("firmament.quickwarp.deez-nutz", "Warping to... Deez Nuts!").grey())
+				MC.sendCommand("warp dhub")
+			}
+		}
+	}
 
-    @Subscribe
-    fun onCommands(it: CommandEvent) {
-        it.register("join") {
-            thenArgument("what", RestArgumentType) { what ->
-                thenExecute {
-                    val what = this[what]
-                    if (!SBData.isOnSkyblock) {
-                        MC.sendCommand("join $what")
-                        return@thenExecute
-                    }
-                    val joinName = getNameForFloor(what.replace(" ", "").lowercase())
-                    if (joinName == null) {
-                        source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown", what))
-                    } else {
-                        source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.success",
-                                                                         joinName))
-                        MC.sendCommand("joininstance $joinName")
-                    }
-                }
-            }
-            thenExecute {
-                source.sendFeedback(Text.translatable("firmament.quick-commands.join.explain"))
-            }
-        }
-    }
+	@Subscribe
+	fun registerJoin(it: CommandEvent) {
+		if (!TConfig.enableJoin) return
+		it.register("join") {
+			thenArgument("what", RestArgumentType) { what ->
+				thenExecute {
+					val what = this[what]
+					if (!SBData.isOnSkyblock) {
+						MC.sendCommand("join $what")
+						return@thenExecute
+					}
+					val joinName = getNameForFloor(what.replace(" ", "").lowercase())
+					if (joinName == null) {
+						source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown", what))
+					} else {
+						source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.success",
+						                                                 joinName))
+						MC.sendCommand("joininstance $joinName")
+					}
+				}
+			}
+			thenExecute {
+				source.sendFeedback(Text.translatable("firmament.quick-commands.join.explain"))
+			}
+		}
+	}
 
-    fun CommandContext<DefaultSource>.getNameForFloor(w: String): String? {
-        val kuudraLevel = removePartialPrefix(w, "kuudratier") ?: removePartialPrefix(w, "tier")
-        if (kuudraLevel != null) {
-            val l = kuudraLevel.toIntOrNull()?.let { it - 1 } ?: kuudraLevelNames.indexOfFirst {
-                it.startsWith(
-                    kuudraLevel,
-                    true
-                )
-            }
-            if (l !in kuudraLevelNames.indices) {
-                source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-kuudra",
-                                                                 kuudraLevel))
-                return null
-            }
-            return "KUUDRA_${kuudraLevelNames[l]}"
-        }
-        val masterLevel = removePartialPrefix(w, "master")
-        val normalLevel =
-            removePartialPrefix(w, "floor") ?: removePartialPrefix(w, "catacombs") ?: removePartialPrefix(w, "dungeons")
-        val dungeonLevel = masterLevel ?: normalLevel
-        if (dungeonLevel != null) {
-            val l = dungeonLevel.toIntOrNull()?.let { it - 1 } ?: dungeonLevelNames.indexOfFirst {
-                it.startsWith(
-                    dungeonLevel,
-                    true
-                )
-            }
-            if (masterLevel == null && (l == -1 || null != removePartialPrefix(w, "entrance"))) {
-                return "CATACOMBS_ENTRANCE"
-            }
-            if (l !in dungeonLevelNames.indices) {
-                source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-catacombs",
-                                                                 kuudraLevel))
-                return null
-            }
-            return "${if (masterLevel != null) "MASTER_" else ""}CATACOMBS_FLOOR_${dungeonLevelNames[l]}"
-        }
-        return null
-    }
+	fun CommandContext<DefaultSource>.getNameForFloor(w: String): String? {
+		val kuudraLevel = removePartialPrefix(w, "kuudratier") ?: removePartialPrefix(w, "tier")
+		if (kuudraLevel != null) {
+			val l = kuudraLevel.toIntOrNull()?.let { it - 1 } ?: kuudraLevelNames.indexOfFirst {
+				it.startsWith(
+					kuudraLevel,
+					true
+				)
+			}
+			if (l !in kuudraLevelNames.indices) {
+				source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-kuudra",
+				                                                 kuudraLevel))
+				return null
+			}
+			return "KUUDRA_${kuudraLevelNames[l]}"
+		}
+		val masterLevel = removePartialPrefix(w, "master")
+		val normalLevel =
+			removePartialPrefix(w, "floor") ?: removePartialPrefix(w, "catacombs") ?: removePartialPrefix(w, "dungeons")
+		val dungeonLevel = masterLevel ?: normalLevel
+		if (dungeonLevel != null) {
+			val l = dungeonLevel.toIntOrNull()?.let { it - 1 } ?: dungeonLevelNames.indexOfFirst {
+				it.startsWith(
+					dungeonLevel,
+					true
+				)
+			}
+			if (masterLevel == null && (l == -1 || null != removePartialPrefix(w, "entrance"))) {
+				return "CATACOMBS_ENTRANCE"
+			}
+			if (l !in dungeonLevelNames.indices) {
+				source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-catacombs",
+				                                                 kuudraLevel))
+				return null
+			}
+			return "${if (masterLevel != null) "MASTER_" else ""}CATACOMBS_FLOOR_${dungeonLevelNames[l]}"
+		}
+		return null
+	}
 }
diff --git a/src/main/kotlin/features/fixes/Fixes.kt b/src/main/kotlin/features/fixes/Fixes.kt
index 5d70b1a..7030319 100644
--- a/src/main/kotlin/features/fixes/Fixes.kt
+++ b/src/main/kotlin/features/fixes/Fixes.kt
@@ -1,71 +1,67 @@
-
-
 package moe.nea.firmament.features.fixes
 
 import moe.nea.jarvis.api.Point
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.option.KeyBinding
-import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.text.Text
-import net.minecraft.util.Arm
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HudRenderEvent
 import moe.nea.firmament.events.WorldKeyboardEvent
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.gui.config.ManagedConfig
 import moe.nea.firmament.util.MC
-import moe.nea.firmament.util.errorBoundary
 
 object Fixes : FirmamentFeature {
-    override val identifier: String
-        get() = "fixes"
+	override val identifier: String
+		get() = "fixes"
 
-    object TConfig : ManagedConfig(identifier, Category.MISC) { // TODO: split this config
-        val fixUnsignedPlayerSkins by toggle("player-skins") { true }
-        var autoSprint by toggle("auto-sprint") { false }
-        val autoSprintKeyBinding by keyBindingWithDefaultUnbound("auto-sprint-keybinding")
-        val autoSprintHud by position("auto-sprint-hud", 80, 10) { Point(0.0, 1.0) }
-        val peekChat by keyBindingWithDefaultUnbound("peek-chat")
-    }
+	object TConfig : ManagedConfig(identifier, Category.MISC) { // TODO: split this config
+		val fixUnsignedPlayerSkins by toggle("player-skins") { true }
+		var autoSprint by toggle("auto-sprint") { false }
+		val autoSprintKeyBinding by keyBindingWithDefaultUnbound("auto-sprint-keybinding")
+		val autoSprintHud by position("auto-sprint-hud", 80, 10) { Point(0.0, 1.0) }
+		val peekChat by keyBindingWithDefaultUnbound("peek-chat")
+		val hidePotionEffects by toggle("hide-mob-effects") { false }
+	}
 
-    override val config: ManagedConfig
-        get() = TConfig
+	override val config: ManagedConfig
+		get() = TConfig
 
-    fun handleIsPressed(
-        keyBinding: KeyBinding,
-        cir: CallbackInfoReturnable<Boolean>
-    ) {
-        if (keyBinding === MinecraftClient.getInstance().options.sprintKey && TConfig.autoSprint && MC.player?.isSprinting != true)
-            cir.returnValue = true
-    }
+	fun handleIsPressed(
+		keyBinding: KeyBinding,
+		cir: CallbackInfoReturnable<Boolean>
+	) {
+		if (keyBinding === MinecraftClient.getInstance().options.sprintKey && TConfig.autoSprint && MC.player?.isSprinting != true)
+			cir.returnValue = true
+	}
 
-    @Subscribe
-    fun onRenderHud(it: HudRenderEvent) {
-        if (!TConfig.autoSprintKeyBinding.isBound) return
-        it.context.matrices.push()
-        TConfig.autoSprintHud.applyTransformations(it.context.matrices)
-        it.context.drawText(
-            MC.font, Text.translatable(
-                if (TConfig.autoSprint)
-                    "firmament.fixes.auto-sprint.on"
-                else if (MC.player?.isSprinting == true)
-                    "firmament.fixes.auto-sprint.sprinting"
-                else
-                    "firmament.fixes.auto-sprint.not-sprinting"
-            ), 0, 0, -1, false
-        )
-        it.context.matrices.pop()
-    }
+	@Subscribe
+	fun onRenderHud(it: HudRenderEvent) {
+		if (!TConfig.autoSprintKeyBinding.isBound) return
+		it.context.matrices.push()
+		TConfig.autoSprintHud.applyTransformations(it.context.matrices)
+		it.context.drawText(
+			MC.font, Text.translatable(
+				if (TConfig.autoSprint)
+					"firmament.fixes.auto-sprint.on"
+				else if (MC.player?.isSprinting == true)
+					"firmament.fixes.auto-sprint.sprinting"
+				else
+					"firmament.fixes.auto-sprint.not-sprinting"
+			), 0, 0, -1, false
+		)
+		it.context.matrices.pop()
+	}
 
-    @Subscribe
-    fun onWorldKeyboard(it: WorldKeyboardEvent) {
-        if (it.matches(TConfig.autoSprintKeyBinding)) {
-            TConfig.autoSprint = !TConfig.autoSprint
-        }
-    }
+	@Subscribe
+	fun onWorldKeyboard(it: WorldKeyboardEvent) {
+		if (it.matches(TConfig.autoSprintKeyBinding)) {
+			TConfig.autoSprint = !TConfig.autoSprint
+		}
+	}
 
-    fun shouldPeekChat(): Boolean {
-        return TConfig.peekChat.isPressed(atLeast = true)
-    }
+	fun shouldPeekChat(): Boolean {
+		return TConfig.peekChat.isPressed(atLeast = true)
+	}
 }
diff --git a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
index d2c555b..fdc378a 100644
--- a/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
+++ b/src/main/kotlin/features/inventory/ItemRarityCosmetics.kt
@@ -29,18 +29,7 @@ object ItemRarityCosmetics : FirmamentFeature {
 	override val config: ManagedConfig
 		get() = TConfig
 
-	private val rarityToColor = mapOf(
-		Rarity.COMMON to Formatting.WHITE,
-		Rarity.UNCOMMON to Formatting.GREEN,
-		Rarity.RARE to Formatting.BLUE,
-		Rarity.EPIC to Formatting.DARK_PURPLE,
-		Rarity.LEGENDARY to Formatting.GOLD,
-		Rarity.MYTHIC to Formatting.LIGHT_PURPLE,
-		Rarity.DIVINE to Formatting.AQUA,
-		Rarity.SPECIAL to Formatting.RED,
-		Rarity.VERY_SPECIAL to Formatting.RED,
-		Rarity.SUPREME to Formatting.DARK_RED,
-	).mapValues {
+	private val rarityToColor = Rarity.colourMap.mapValues {
 		val c = Color(it.value.colorValue!!)
 		c.rgb
 	}
diff --git a/src/main/kotlin/features/inventory/SlotLocking.kt b/src/main/kotlin/features/inventory/SlotLocking.kt
index fc09476..99130d5 100644
--- a/src/main/kotlin/features/inventory/SlotLocking.kt
+++ b/src/main/kotlin/features/inventory/SlotLocking.kt
@@ -2,7 +2,6 @@
 
 package moe.nea.firmament.features.inventory
 
-import com.mojang.blaze3d.systems.RenderSystem
 import java.util.UUID
 import org.lwjgl.glfw.GLFW
 import kotlinx.serialization.Serializable
@@ -14,6 +13,7 @@ import net.minecraft.screen.GenericContainerScreenHandler
 import net.minecraft.screen.slot.Slot
 import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.util.Identifier
+import net.minecraft.util.StringIdentifiable
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HandledScreenForegroundEvent
 import moe.nea.firmament.events.HandledScreenKeyPressedEvent
@@ -59,6 +59,17 @@ object SlotLocking : FirmamentFeature {
 		}
 		val slotBind by keyBinding("bind") { GLFW.GLFW_KEY_L }
 		val slotBindRequireShift by toggle("require-quick-move") { true }
+		val slotRenderLines by choice("bind-render") { SlotRenderLinesMode.ONLY_BOXES }
+	}
+
+	enum class SlotRenderLinesMode : StringIdentifiable {
+		EVERYTHING,
+		ONLY_BOXES,
+		NOTHING;
+
+		override fun asString(): String {
+			return name
+		}
 	}
 
 	override val config: TConfig
@@ -95,7 +106,7 @@ object SlotLocking : FirmamentFeature {
 		if (handler.inventory.size() < 9) return false
 		val sellItem = handler.inventory.getStack(handler.inventory.size() - 5)
 		if (sellItem == null) return false
-		if (sellItem.displayNameAccordingToNbt?.unformattedString == "Sell Item") return true
+		if (sellItem.displayNameAccordingToNbt.unformattedString == "Sell Item") return true
 		val lore = sellItem.loreAccordingToNbt
 		return (lore.lastOrNull() ?: return false).unformattedString == "Click to buyback!"
 	}
@@ -104,7 +115,7 @@ object SlotLocking : FirmamentFeature {
 	fun onSalvageProtect(event: IsSlotProtectedEvent) {
 		if (event.slot == null) return
 		if (!event.slot.hasStack()) return
-		if (event.slot.stack.displayNameAccordingToNbt?.unformattedString != "Salvage Items") return
+		if (event.slot.stack.displayNameAccordingToNbt.unformattedString != "Salvage Items") return
 		val inv = event.slot.inventory
 		var anyBlocked = false
 		for (i in 0 until event.slot.index) {
@@ -227,23 +238,32 @@