From c4de2248ab6628b98494eccd87cf8f3bdd0d8c42 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 16 Oct 2022 19:46:08 +0700 Subject: [PATCH] Disallow to quickly pickup items from equipment slots on doubleclick --- .../mc/otm/compat/cos/CosmeticArmorCompat.kt | 4 ++++ .../dbotthepony/mc/otm/compat/curios/CuriosCompat.kt | 12 ++++++++++++ .../kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt | 8 ++++++++ src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt | 4 ++++ 4 files changed, 28 insertions(+) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt index 67e487169..30d41b08a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt @@ -58,6 +58,10 @@ private class CosmeticSlot(container: Container, private val slot: EquipmentSlot return 1 } + override fun canTakeItemForPickAll(): Boolean { + return false + } + override fun getNoItemIcon(): com.mojang.datafixers.util.Pair? { return when (slot) { EquipmentSlot.FEET -> com.mojang.datafixers.util.Pair.of(InventoryMenu.BLOCK_ATLAS, InventoryMenu.EMPTY_ARMOR_SLOT_BOOTS) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt index 168555593..ddda5ccb1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt @@ -113,3 +113,15 @@ fun Player.curiosAwareStream(includeCosmetics: Boolean = true): Stream