From 8727571e958b4b0611b081080e0457cc4b7961dd Mon Sep 17 00:00:00 2001 From: repo_alt Date: Sat, 5 Mar 2022 10:48:02 +0300 Subject: [PATCH] Changed APU component support a bit, to fix tooltip (Still a hack, but it's local and quite straightforward) --- src/main/scala/li/cil/oc/common/item/APU.scala | 1 + src/main/scala/li/cil/oc/common/item/CPU.scala | 1 + src/main/scala/li/cil/oc/common/item/traits/CPULike.scala | 3 ++- .../scala/li/cil/oc/integration/opencomputers/DriverAPU.scala | 3 +-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/item/APU.scala b/src/main/scala/li/cil/oc/common/item/APU.scala index 57835d687..dde24ade8 100644 --- a/src/main/scala/li/cil/oc/common/item/APU.scala +++ b/src/main/scala/li/cil/oc/common/item/APU.scala @@ -15,6 +15,7 @@ class APU(val parent: Delegator, val tier: Int) extends traits.Delegate with tra else super.rarity(stack) override def cpuTier = math.min(Tier.Three, tier + 1) + override def cpuTierForComponents = tier + 1 override def gpuTier = tier diff --git a/src/main/scala/li/cil/oc/common/item/CPU.scala b/src/main/scala/li/cil/oc/common/item/CPU.scala index bc8aacce4..dcf2cac92 100644 --- a/src/main/scala/li/cil/oc/common/item/CPU.scala +++ b/src/main/scala/li/cil/oc/common/item/CPU.scala @@ -6,6 +6,7 @@ class CPU(val parent: Delegator, val tier: Int) extends traits.Delegate with tra override val unlocalizedName = super.unlocalizedName + tier override def cpuTier = tier + override def cpuTierForComponents = tier override protected def tooltipName = Option(super.unlocalizedName) } diff --git a/src/main/scala/li/cil/oc/common/item/traits/CPULike.scala b/src/main/scala/li/cil/oc/common/item/traits/CPULike.scala index bd0c54357..6336c6a5d 100644 --- a/src/main/scala/li/cil/oc/common/item/traits/CPULike.scala +++ b/src/main/scala/li/cil/oc/common/item/traits/CPULike.scala @@ -17,8 +17,9 @@ import scala.language.existentials trait CPULike extends Delegate { def cpuTier: Int + def cpuTierForComponents: Int // Creative APU provides components like T4 CPU, but there is no T4 CPU - override protected def tooltipData: Seq[Any] = Seq(Settings.get.cpuComponentSupport(cpuTier)) + override protected def tooltipData: Seq[Any] = Seq(Settings.get.cpuComponentSupport(cpuTierForComponents)) override protected def tooltipExtended(stack: ItemStack, tooltip: util.List[String]) { tooltip.addAll(Tooltip.get("CPU.Architecture", api.Machine.getArchitectureName(DriverCPU.architecture(stack)))) diff --git a/src/main/scala/li/cil/oc/integration/opencomputers/DriverAPU.scala b/src/main/scala/li/cil/oc/integration/opencomputers/DriverAPU.scala index f425987eb..1ca95dc3c 100644 --- a/src/main/scala/li/cil/oc/integration/opencomputers/DriverAPU.scala +++ b/src/main/scala/li/cil/oc/integration/opencomputers/DriverAPU.scala @@ -25,8 +25,7 @@ object DriverAPU extends DriverCPU with HostAware { } override def supportedComponents(stack: ItemStack) = Delegator.subItem(stack) match { - // have to use GPU tier here because CPU tier is limited by 3, creative tier is special - case Some(apu: common.item.APU) => Settings.get.cpuComponentSupport(apu.gpuTier + 1) + case Some(apu: common.item.APU) => Settings.get.cpuComponentSupport(apu.cpuTierForComponents) case _ => Settings.get.cpuComponentSupport(1) }