Repo-Mirror/Reforges
9
0
Fork 0
mirror of https://github.com/Auxilor/Reforges.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases 1 Activity

Final touches to GUI

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt
View File

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

4
eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt
View File

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

6
eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt
View File

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