From f70aa5cc60e4aabad1d604b3876907c9e66ec463 Mon Sep 17 00:00:00 2001 From: dongzh1 <1484813603@qq.com> Date: Mon, 15 Jan 2024 15:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eneigeitems=E5=85=BC=E5=AE=B9,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=8F=B3=E9=94=AE=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xbaimiao/shoppro/core/shop/ShopImpl.kt | 33 ++++++++++++++----- src/main/resources/config.yml | 2 +- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt index 21c6aaf..907147b 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt +++ b/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt @@ -9,6 +9,8 @@ import com.github.xbaimiao.shoppro.core.item.KetherCondition import com.github.xbaimiao.shoppro.core.item.ShopItem import com.github.xbaimiao.shoppro.util.Util.howManyItems import com.github.xbaimiao.shoppro.util.Util.replacePapi +import io.lumine.xikage.mythicmobs.utils.adventure.text.minimessage.MiniMessage +import io.lumine.xikage.mythicmobs.utils.adventure.text.minimessage.MiniMessageImpl import org.bukkit.Bukkit import org.bukkit.configuration.Configuration import org.bukkit.entity.Player @@ -122,17 +124,32 @@ class ShopImpl(private val configuration: Configuration) : Shop() { if (event.clickType != ClickType.CLICK) { return@onClick } - val amount = when (event.clickEvent().click) { - org.bukkit.event.inventory.ClickType.LEFT -> 1 - org.bukkit.event.inventory.ClickType.RIGHT -> 64 - org.bukkit.event.inventory.ClickType.SHIFT_RIGHT -> { - player.inventory.howManyItems { - item.equal(it) + val amount : Int + if (configuration.getBoolean("items.${item.key}.right_click")){ + amount = when (event.clickEvent().click) { + org.bukkit.event.inventory.ClickType.LEFT -> 1 + org.bukkit.event.inventory.ClickType.RIGHT -> 64 + org.bukkit.event.inventory.ClickType.SHIFT_RIGHT -> { + player.inventory.howManyItems { + item.equal(it) + } } - } - else -> return@onClick + else -> return@onClick + } + }else{ + amount = when (event.clickEvent().click) { + org.bukkit.event.inventory.ClickType.LEFT -> 1 + org.bukkit.event.inventory.ClickType.SHIFT_RIGHT -> { + player.inventory.howManyItems { + item.equal(it) + } + } + + else -> return@onClick + } } + checkSellLimit(amount, item, player) event.currentItem?.let { event.clickEvent().inventory.setItem(event.rawSlot, item.update(player)) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 0c12170..6cf01c1 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -11,4 +11,4 @@ mysql: # 出售/购买成功的声音 the_voice_of_success: '' # 出售/购买失败的声音 -the_voice_of_failure: '' \ No newline at end of file +the_voice_of_failure: ''