Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer block you from taking out items from the salvage menu

Browse Source
This commit is contained in:
Linnea Gräf
2024-07-20 16:45:51 +02:00
parent 3ad44b992f
commit 0859fa773b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt
View File

@@ -18,7 +18,6 @@ import kotlinx.serialization.serializer
import net.minecraft.client.gui.screen.ingame.HandledScreen import net.minecraft.client.gui.screen.ingame.HandledScreen
import net.minecraft.entity.player.PlayerInventory import net.minecraft.entity.player.PlayerInventory
import net.minecraft.screen.GenericContainerScreenHandler import net.minecraft.screen.GenericContainerScreenHandler
import net.minecraft.screen.slot.Slot
import net.minecraft.screen.slot.SlotActionType import net.minecraft.screen.slot.SlotActionType
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import moe.nea.firmament.annotations.Subscribe import moe.nea.firmament.annotations.Subscribe
@@ -124,7 +123,9 @@ object SlotLocking : FirmamentFeature {
|| event.actionType == SlotActionType.PICKUP_ALL || event.actionType == SlotActionType.PICKUP_ALL
val isSellOrTradeScreen = val isSellOrTradeScreen =
isNpcShop(MC.handledScreen) || isTradeScreen(MC.handledScreen) || isSalvageScreen(MC.handledScreen) isNpcShop(MC.handledScreen) || isTradeScreen(MC.handledScreen) || isSalvageScreen(MC.handledScreen)
if (!isSellOrTradeScreen && doesNotDeleteItem) return if ((!isSellOrTradeScreen || event.slot?.inventory !is PlayerInventory)
&& doesNotDeleteItem
) return
val stack = event.itemStack ?: return val stack = event.itemStack ?: return
val uuid = stack.skyblockUUID ?: return val uuid = stack.skyblockUUID ?: return
if (uuid in (lockedUUIDs ?: return)) { if (uuid in (lockedUUIDs ?: return)) {