9
0
mirror of https://github.com/Auxilor/Reforges.git synced 2025-12-27 10:59:23 +00:00

Final touches to GUI

This commit is contained in:
Auxilor
2022-11-09 15:23:57 +00:00
parent 1dc15fcb53
commit 192bb138ff
3 changed files with 12 additions and 3 deletions

View File

@@ -24,6 +24,7 @@ import com.willfp.ecomponent.CaptiveItem
import com.willfp.ecomponent.menuStateVar
import com.willfp.ecomponent.setSlot
import com.willfp.reforges.reforges.PriceMultipliers
import com.willfp.reforges.reforges.PriceMultipliers.reforgePriceMultiplier
import com.willfp.reforges.reforges.Reforge
import com.willfp.reforges.reforges.ReforgeTarget
import com.willfp.reforges.reforges.ReforgeTargets
@@ -266,7 +267,7 @@ object ReforgeGUI {
.pow(reforges.toDouble())
}
multiplier *= PriceMultipliers.getForPlayer(player).multiplier
multiplier *= player.reforgePriceMultiplier
status.price.setMultiplier(player, multiplier)
}
@@ -284,7 +285,7 @@ object ReforgeGUI {
val status = if (item.isEmpty) {
ReforgeStatus.NO_ITEM
} else {
targets.addAll(ReforgeTargets.getForItem(item!!))
targets.addAll(ReforgeTargets.getForItem(item))
if (targets.isEmpty()) {
ReforgeStatus.INVALID_ITEM
} else {

View File

@@ -34,6 +34,10 @@ object PriceMultipliers {
return current
}
/** The price multiplier from permissions. */
val Player.reforgePriceMultiplier: Double
get() = getForPlayer(this).multiplier
/**
* List of all registered multipliers.
*

View File

@@ -33,7 +33,11 @@ object ReforgeTargets {
* @return The target.
*/
@JvmStatic
fun getForItem(item: ItemStack): List<ReforgeTarget> {
fun getForItem(item: ItemStack?): List<ReforgeTarget> {
if (item == null) {
return emptyList()
}
return registered.values
.filter { !it.id.equals("all", ignoreCase = true) }
.filter { it.matches(item) }