diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 8537f33..752d0b7 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -8,4 +8,6 @@ dependencies { compileOnly 'com.willfp:EcoEnchants:8.2.0' compileOnly 'com.willfp:EcoSkills:1.2.4' compileOnly 'com.github.brcdev-minecraft:shopgui-api:2.2.0' + + compileOnly fileTree(dir: '../../lib', include: ['*.jar']) } \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster15SellMultiplier.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster15SellMultiplier.kt index 6a50e71..2ec5c2f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster15SellMultiplier.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster15SellMultiplier.kt @@ -3,6 +3,7 @@ package com.willfp.boosters.boosters.boosters import com.willfp.boosters.BoostersPlugin import com.willfp.boosters.activeBooster import com.willfp.boosters.boosters.Booster +import dev.norska.dsw.api.DeluxeSellwandSellEvent import net.brcdev.shopgui.event.ShopPreTransactionEvent import net.brcdev.shopgui.shop.ShopManager import org.bukkit.Bukkit @@ -31,4 +32,17 @@ class Booster15SellMultiplier: Booster( event.price *= 1.5 } + + @EventHandler(priority = EventPriority.HIGH) + fun handle(event: DeluxeSellwandSellEvent) { + if (Bukkit.getServer().activeBooster != this) { + return + } + + if (event.isCancelled) { + return + } + + event.money *= 1.5 + } } \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster2SellMultiplier.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster2SellMultiplier.kt index 80f0ec5..8210c0c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster2SellMultiplier.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/boosters/boosters/Booster2SellMultiplier.kt @@ -3,6 +3,7 @@ package com.willfp.boosters.boosters.boosters import com.willfp.boosters.BoostersPlugin import com.willfp.boosters.activeBooster import com.willfp.boosters.boosters.Booster +import dev.norska.dsw.api.DeluxeSellwandSellEvent import net.brcdev.shopgui.event.ShopPreTransactionEvent import net.brcdev.shopgui.shop.ShopManager import org.bukkit.Bukkit @@ -31,4 +32,17 @@ class Booster2SellMultiplier: Booster( event.price *= 2 } + + @EventHandler(priority = EventPriority.HIGH) + fun handle(event: DeluxeSellwandSellEvent) { + if (Bukkit.getServer().activeBooster != this) { + return + } + + if (event.isCancelled) { + return + } + + event.money *= 2 + } } \ No newline at end of file diff --git a/lib/DeluxeSellwands Build 22e.jar b/lib/DeluxeSellwands Build 22e.jar new file mode 100644 index 0000000..f290560 Binary files /dev/null and b/lib/DeluxeSellwands Build 22e.jar differ