Fix processing upgrade showing two plus signs in description

This commit is contained in:
DBotThePony 2023-07-18 21:13:51 +07:00
parent cc9d2ef4eb
commit 9758a3474c
Signed by: DBot
GPG Key ID: DCC23B5715498507

View File

@ -96,7 +96,7 @@ fun IMatteryUpgrade.addUpgradeTooltipLines(tooltips: MutableCollection<Component
} }
if (processingItems != 0) { if (processingItems != 0) {
tooltips.add(TranslatableComponent("otm.gui.upgrade.processing_items", TextComponent("+$processingItems").withStyle(ChatFormatting.DARK_GREEN)).withStyle(ChatFormatting.GRAY)) tooltips.add(TranslatableComponent("otm.gui.upgrade.processing_items", TextComponent(processingItems.toString()).withStyle(ChatFormatting.DARK_GREEN)).withStyle(ChatFormatting.GRAY))
} }
if (energyStorageFlat != Decimal.ZERO) { if (energyStorageFlat != Decimal.ZERO) {
@ -157,9 +157,13 @@ enum class UpgradeType {
@JvmField @JvmField
val ALL = set(*values()) val ALL = set(*values())
@JvmField @JvmField
val BASIC = set(SPEED, ENERGY_STORAGE, ENERGY_CONSUMPTION, ENERGY_THROUGHPUT) val BASIC = set(SPEED, ENERGY_STORAGE, ENERGY_CONSUMPTION, ENERGY_THROUGHPUT)
@JvmField
val BASIC_PROCESSING = set(SPEED, ENERGY_STORAGE, ENERGY_CONSUMPTION, ENERGY_THROUGHPUT, PROCESSING)
fun set(vararg types: UpgradeType): Set<UpgradeType> { fun set(vararg types: UpgradeType): Set<UpgradeType> {
var flags = 0 var flags = 0
for (v in types) flags = flags or v.flag for (v in types) flags = flags or v.flag