From 4d57229b9464e0f85f51df44ce204b5ea866f0dd Mon Sep 17 00:00:00 2001 From: nea Date: Fri, 29 Sep 2023 21:23:39 +0200 Subject: Add separate slot locking profile for the Rift --- .../moe/nea/firmament/features/inventory/SlotLocking.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/main/kotlin') diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt index 5de8951..76a719a 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt @@ -6,8 +6,10 @@ package moe.nea.firmament.features.inventory +import org.lwjgl.glfw.GLFW import kotlinx.serialization.Serializable import kotlinx.serialization.serializer +import net.minecraft.entity.player.PlayerInventory import moe.nea.firmament.events.HandledScreenKeyPressedEvent import moe.nea.firmament.events.IsSlotProtectedEvent import moe.nea.firmament.events.SlotRenderEvents @@ -16,9 +18,8 @@ import moe.nea.firmament.gui.config.ManagedConfig import moe.nea.firmament.mixins.accessor.AccessorHandledScreen import moe.nea.firmament.util.CommonSoundEffects import moe.nea.firmament.util.MC +import moe.nea.firmament.util.SBData import moe.nea.firmament.util.data.ProfileSpecificDataHolder -import net.minecraft.entity.player.PlayerInventory -import org.lwjgl.glfw.GLFW object SlotLocking : FirmamentFeature { override val identifier: String @@ -27,6 +28,7 @@ object SlotLocking : FirmamentFeature { @Serializable data class Data( val lockedSlots: MutableSet = mutableSetOf(), + val lockedSlotsRift: MutableSet = mutableSetOf(), ) object TConfig : ManagedConfig(identifier) { @@ -34,11 +36,17 @@ object SlotLocking : FirmamentFeature { } override val config: TConfig - get() = TConfig + get() = TConfig object DConfig : ProfileSpecificDataHolder(serializer(), "locked-slots", ::Data) - val lockedSlots get() = DConfig.data?.lockedSlots + val lockedSlots + get() = when (SBData.skyblockLocation) { + "rift" -> DConfig.data?.lockedSlotsRift + null -> null + else -> DConfig.data?.lockedSlots + } + override fun onLoad() { HandledScreenKeyPressedEvent.subscribe { if (!it.matches(TConfig.lock)) return@subscribe -- cgit