From 0ab6636b8ab4d9d8bc0993c155d67cb3686d44ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 20 May 2015 23:16:08 +0200 Subject: [PATCH] Moved ItemTier to traits package. --- src/main/scala/li/cil/oc/client/Textures.scala | 1 + src/main/scala/li/cil/oc/common/item/APU.scala | 2 +- src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala | 2 +- src/main/scala/li/cil/oc/common/item/CPU.scala | 2 +- src/main/scala/li/cil/oc/common/item/ComponentBus.scala | 2 +- src/main/scala/li/cil/oc/common/item/DroneCase.scala | 2 +- src/main/scala/li/cil/oc/common/item/GraphicsCard.scala | 2 +- src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala | 2 +- src/main/scala/li/cil/oc/common/item/InternetCard.scala | 2 +- src/main/scala/li/cil/oc/common/item/LinkedCard.scala | 2 +- src/main/scala/li/cil/oc/common/item/Memory.scala | 2 +- .../scala/li/cil/oc/common/item/MicrocontrollerCase.scala | 2 +- src/main/scala/li/cil/oc/common/item/NetworkCard.scala | 2 +- src/main/scala/li/cil/oc/common/item/RedstoneCard.scala | 2 +- src/main/scala/li/cil/oc/common/item/TabletCase.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala | 2 +- .../scala/li/cil/oc/common/item/UpgradeChunkloader.scala | 2 +- .../scala/li/cil/oc/common/item/UpgradeContainerCard.scala | 2 +- .../li/cil/oc/common/item/UpgradeContainerUpgrade.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeDatabase.scala | 6 +++--- .../scala/li/cil/oc/common/item/UpgradeExperience.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeHover.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala | 2 +- .../li/cil/oc/common/item/UpgradeInventoryController.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeLeash.scala | 2 +- .../scala/li/cil/oc/common/item/UpgradeNavigation.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradePiston.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeSign.scala | 2 +- .../scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala | 2 +- src/main/scala/li/cil/oc/common/item/UpgradeTank.scala | 2 +- .../scala/li/cil/oc/common/item/UpgradeTankController.scala | 2 +- .../scala/li/cil/oc/common/item/UpgradeTractorBeam.scala | 2 +- .../scala/li/cil/oc/common/item/WirelessNetworkCard.scala | 2 +- src/main/scala/li/cil/oc/common/item/WorldSensorCard.scala | 2 +- .../scala/li/cil/oc/common/item/{ => traits}/ItemTier.scala | 3 ++- 38 files changed, 41 insertions(+), 39 deletions(-) rename src/main/scala/li/cil/oc/common/item/{ => traits}/ItemTier.scala (88%) diff --git a/src/main/scala/li/cil/oc/client/Textures.scala b/src/main/scala/li/cil/oc/client/Textures.scala index 3e241651b..49b537d2d 100644 --- a/src/main/scala/li/cil/oc/client/Textures.scala +++ b/src/main/scala/li/cil/oc/client/Textures.scala @@ -130,5 +130,6 @@ object Textures { tm.bindTexture(upgradeCrafting) tm.bindTexture(upgradeGenerator) + tm.bindTexture(upgradeInventory) } } 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 c6d3ec709..3fc92e7d9 100644 --- a/src/main/scala/li/cil/oc/common/item/APU.scala +++ b/src/main/scala/li/cil/oc/common/item/APU.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.item import scala.language.existentials -class APU(val parent: Delegator, val tier: Int) extends Delegate with ItemTier with traits.CPULike with traits.GPULike { +class APU(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier with traits.CPULike with traits.GPULike { override val unlocalizedName = super[Delegate].unlocalizedName + tier override def cpuTier = tier + 1 diff --git a/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala b/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala index b69c76d57..7005aad61 100644 --- a/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala +++ b/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala @@ -2,6 +2,6 @@ package li.cil.oc.common.item import li.cil.oc.integration.Mods -class AbstractBusCard(val parent: Delegator) extends Delegate with ItemTier { +class AbstractBusCard(val parent: Delegator) extends Delegate with traits.ItemTier { showInItemList = Mods.StargateTech2.isAvailable } 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 77fa228d6..20a2ad318 100644 --- a/src/main/scala/li/cil/oc/common/item/CPU.scala +++ b/src/main/scala/li/cil/oc/common/item/CPU.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.item import scala.language.existentials -class CPU(val parent: Delegator, val tier: Int) extends Delegate with ItemTier with traits.CPULike { +class CPU(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier with traits.CPULike { override val unlocalizedName = super.unlocalizedName + tier override def cpuTier = tier diff --git a/src/main/scala/li/cil/oc/common/item/ComponentBus.scala b/src/main/scala/li/cil/oc/common/item/ComponentBus.scala index f98575f9f..80ad6cca0 100644 --- a/src/main/scala/li/cil/oc/common/item/ComponentBus.scala +++ b/src/main/scala/li/cil/oc/common/item/ComponentBus.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.item import li.cil.oc.Settings -class ComponentBus(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class ComponentBus(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/DroneCase.scala b/src/main/scala/li/cil/oc/common/item/DroneCase.scala index 9a90eb3d2..6f637f976 100644 --- a/src/main/scala/li/cil/oc/common/item/DroneCase.scala +++ b/src/main/scala/li/cil/oc/common/item/DroneCase.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.item import net.minecraft.item.ItemStack -class DroneCase(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class DroneCase(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tierFromDriver(stack: ItemStack) = tier diff --git a/src/main/scala/li/cil/oc/common/item/GraphicsCard.scala b/src/main/scala/li/cil/oc/common/item/GraphicsCard.scala index 6b359e41a..9b27680f2 100644 --- a/src/main/scala/li/cil/oc/common/item/GraphicsCard.scala +++ b/src/main/scala/li/cil/oc/common/item/GraphicsCard.scala @@ -1,6 +1,6 @@ package li.cil.oc.common.item -class GraphicsCard(val parent: Delegator, val tier: Int) extends Delegate with ItemTier with traits.GPULike { +class GraphicsCard(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier with traits.GPULike { override val unlocalizedName = super.unlocalizedName + tier override def gpuTier = tier diff --git a/src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala b/src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala index 2e187fcd7..6ddc57b54 100644 --- a/src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala +++ b/src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala @@ -6,7 +6,7 @@ import li.cil.oc.Settings import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack -class HardDiskDrive(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class HardDiskDrive(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier val kiloBytes = Settings.get.hddSizes(tier) diff --git a/src/main/scala/li/cil/oc/common/item/InternetCard.scala b/src/main/scala/li/cil/oc/common/item/InternetCard.scala index 8ce72e4c4..878ddfe17 100644 --- a/src/main/scala/li/cil/oc/common/item/InternetCard.scala +++ b/src/main/scala/li/cil/oc/common/item/InternetCard.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class InternetCard(val parent: Delegator) extends Delegate with ItemTier +class InternetCard(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/LinkedCard.scala b/src/main/scala/li/cil/oc/common/item/LinkedCard.scala index 9bdbecdb4..c412f8341 100644 --- a/src/main/scala/li/cil/oc/common/item/LinkedCard.scala +++ b/src/main/scala/li/cil/oc/common/item/LinkedCard.scala @@ -7,7 +7,7 @@ import li.cil.oc.util.Tooltip import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack -class LinkedCard(val parent: Delegator) extends Delegate with ItemTier { +class LinkedCard(val parent: Delegator) extends Delegate with traits.ItemTier { override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) { if (stack.hasTagCompound && stack.getTagCompound.hasKey(Settings.namespace + "data")) { val data = stack.getTagCompound.getCompoundTag(Settings.namespace + "data") diff --git a/src/main/scala/li/cil/oc/common/item/Memory.scala b/src/main/scala/li/cil/oc/common/item/Memory.scala index 9483351ee..54a14a5b2 100644 --- a/src/main/scala/li/cil/oc/common/item/Memory.scala +++ b/src/main/scala/li/cil/oc/common/item/Memory.scala @@ -1,6 +1,6 @@ package li.cil.oc.common.item -class Memory(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class Memory(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/MicrocontrollerCase.scala b/src/main/scala/li/cil/oc/common/item/MicrocontrollerCase.scala index de0340e22..0172fd6e6 100644 --- a/src/main/scala/li/cil/oc/common/item/MicrocontrollerCase.scala +++ b/src/main/scala/li/cil/oc/common/item/MicrocontrollerCase.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.item import net.minecraft.item.ItemStack -class MicrocontrollerCase(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class MicrocontrollerCase(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tierFromDriver(stack: ItemStack) = tier diff --git a/src/main/scala/li/cil/oc/common/item/NetworkCard.scala b/src/main/scala/li/cil/oc/common/item/NetworkCard.scala index 3ce5770e9..a8c59d1cd 100644 --- a/src/main/scala/li/cil/oc/common/item/NetworkCard.scala +++ b/src/main/scala/li/cil/oc/common/item/NetworkCard.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class NetworkCard(val parent: Delegator) extends Delegate with ItemTier +class NetworkCard(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala index 01c06b849..862bd53ba 100644 --- a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala +++ b/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala @@ -7,7 +7,7 @@ import li.cil.oc.integration.Mods import li.cil.oc.util.Tooltip import net.minecraft.item.ItemStack -class RedstoneCard(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class RedstoneCard(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/TabletCase.scala b/src/main/scala/li/cil/oc/common/item/TabletCase.scala index c7a420393..dbab17a30 100644 --- a/src/main/scala/li/cil/oc/common/item/TabletCase.scala +++ b/src/main/scala/li/cil/oc/common/item/TabletCase.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.item import net.minecraft.item.ItemStack -class TabletCase(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class TabletCase(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tierFromDriver(stack: ItemStack) = tier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala b/src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala index a6c75695d..686e84fc5 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeAngel(val parent: Delegator) extends Delegate with ItemTier +class UpgradeAngel(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala b/src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala index 8c9f07ea6..87fbf5ce8 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala @@ -5,7 +5,7 @@ import li.cil.oc.api.driver.item.Chargeable import li.cil.oc.common.item.data.NodeData import net.minecraft.item.ItemStack -class UpgradeBattery(val parent: Delegator, val tier: Int) extends Delegate with ItemTier with Chargeable { +class UpgradeBattery(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier with Chargeable { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala b/src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala index 4d40eb439..e77daa0d9 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeChunkloader(val parent: Delegator) extends Delegate with ItemTier +class UpgradeChunkloader(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala b/src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala index 68c835127..4472ac4ee 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala @@ -1,6 +1,6 @@ package li.cil.oc.common.item -class UpgradeContainerCard(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class UpgradeContainerCard(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala b/src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala index bc1fa438c..594f79a14 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala @@ -1,6 +1,6 @@ package li.cil.oc.common.item -class UpgradeContainerUpgrade(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class UpgradeContainerUpgrade(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala index 37f84167d..1aca6ec40 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeCrafting(val parent: Delegator) extends Delegate with ItemTier +class UpgradeCrafting(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeDatabase.scala b/src/main/scala/li/cil/oc/common/item/UpgradeDatabase.scala index c63dc54fe..ffc6be0fd 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeDatabase.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeDatabase.scala @@ -1,14 +1,14 @@ package li.cil.oc.common.item -import li.cil.oc.common.GuiType -import li.cil.oc.util.Rarity import li.cil.oc.OpenComputers import li.cil.oc.Settings +import li.cil.oc.common.GuiType +import li.cil.oc.util.Rarity import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.world.World -class UpgradeDatabase(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class UpgradeDatabase(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala b/src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala index 522520a77..cd4d807fd 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeExperience(val parent: Delegator) extends Delegate with ItemTier +class UpgradeExperience(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala b/src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala index 740733fb4..ac02b4e61 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala @@ -2,6 +2,6 @@ package li.cil.oc.common.item import li.cil.oc.Settings -class UpgradeGenerator(val parent: Delegator) extends Delegate with ItemTier { +class UpgradeGenerator(val parent: Delegator) extends Delegate with traits.ItemTier { override protected def tooltipData = Seq((Settings.get.generatorEfficiency * 100).toInt) } diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeHover.scala b/src/main/scala/li/cil/oc/common/item/UpgradeHover.scala index 9e5a3072b..9e698a64e 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeHover.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeHover.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.item import li.cil.oc.Settings -class UpgradeHover(val parent: Delegator, val tier: Int) extends Delegate with ItemTier { +class UpgradeHover(val parent: Delegator, val tier: Int) extends Delegate with traits.ItemTier { override val unlocalizedName = super.unlocalizedName + tier override protected def tooltipName = Option(super.unlocalizedName) diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala b/src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala index 32ccb1d14..d8ad4df6a 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeInventory(val parent: Delegator) extends Delegate with ItemTier \ No newline at end of file +class UpgradeInventory(val parent: Delegator) extends Delegate with traits.ItemTier \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.scala b/src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.scala index 5e3b233b4..7e45d55b5 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeInventoryController(val parent: Delegator) extends Delegate with ItemTier \ No newline at end of file +class UpgradeInventoryController(val parent: Delegator) extends Delegate with traits.ItemTier \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeLeash.scala b/src/main/scala/li/cil/oc/common/item/UpgradeLeash.scala index c7c85f762..795f57c5f 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeLeash.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeLeash.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeLeash(val parent: Delegator) extends Delegate with ItemTier +class UpgradeLeash(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala b/src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala index be8111a75..b5ffbde86 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeNavigation(val parent: Delegator) extends Delegate with ItemTier \ No newline at end of file +class UpgradeNavigation(val parent: Delegator) extends Delegate with traits.ItemTier \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/item/UpgradePiston.scala b/src/main/scala/li/cil/oc/common/item/UpgradePiston.scala index 49e50ec54..32d8a1bb4 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradePiston.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradePiston.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradePiston(val parent: Delegator) extends Delegate with ItemTier +class UpgradePiston(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeSign.scala b/src/main/scala/li/cil/oc/common/item/UpgradeSign.scala index b467b12bb..ac158f15d 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeSign.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeSign.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeSign(val parent: Delegator) extends Delegate with ItemTier +class UpgradeSign(val parent: Delegator) extends Delegate with traits.ItemTier diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala b/src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala index 921148fb5..79d2c12eb 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala @@ -2,6 +2,6 @@ package li.cil.oc.common.item import li.cil.oc.Settings -class UpgradeSolarGenerator(val parent: Delegator) extends Delegate with ItemTier { +class UpgradeSolarGenerator(val parent: Delegator) extends Delegate with traits.ItemTier { override protected def tooltipData = Seq((Settings.get.solarGeneratorEfficiency * 100).toInt) } diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala b/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala index 5a2d3c053..26d6635a0 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeTank.scala @@ -9,7 +9,7 @@ import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraftforge.fluids.FluidStack -class UpgradeTank(val parent: Delegator) extends Delegate with ItemTier { +class UpgradeTank(val parent: Delegator) extends Delegate with traits.ItemTier { @SideOnly(Side.CLIENT) override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) = { if (stack.hasTagCompound) { diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeTankController.scala b/src/main/scala/li/cil/oc/common/item/UpgradeTankController.scala index 34ccea9b5..a03f9554c 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeTankController.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeTankController.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeTankController(val parent: Delegator) extends Delegate with ItemTier \ No newline at end of file +class UpgradeTankController(val parent: Delegator) extends Delegate with traits.ItemTier \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeTractorBeam.scala b/src/main/scala/li/cil/oc/common/item/UpgradeTractorBeam.scala index 48daaacfd..076d6e1f4 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeTractorBeam.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeTractorBeam.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class UpgradeTractorBeam(val parent: Delegator) extends Delegate with ItemTier \ No newline at end of file +class UpgradeTractorBeam(val parent: Delegator) extends Delegate with traits.ItemTier \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala index e7f2555ce..cafe61414 100644 --- a/src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala +++ b/src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala @@ -1,3 +1,3 @@ package li.cil.oc.common.item -class WirelessNetworkCard(val parent: Delegator) extends Delegate with ItemTier \ No newline at end of file +class WirelessNetworkCard(val parent: Delegator) extends Delegate with traits.ItemTier \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/common/item/WorldSensorCard.scala b/src/main/scala/li/cil/oc/common/item/WorldSensorCard.scala index 434958074..60435cac7 100644 --- a/src/main/scala/li/cil/oc/common/item/WorldSensorCard.scala +++ b/src/main/scala/li/cil/oc/common/item/WorldSensorCard.scala @@ -2,6 +2,6 @@ package li.cil.oc.common.item import li.cil.oc.integration.Mods -class WorldSensorCard(val parent: Delegator) extends Delegate with ItemTier { +class WorldSensorCard(val parent: Delegator) extends Delegate with traits.ItemTier { showInItemList = Mods.Galacticraft.isAvailable } diff --git a/src/main/scala/li/cil/oc/common/item/ItemTier.scala b/src/main/scala/li/cil/oc/common/item/traits/ItemTier.scala similarity index 88% rename from src/main/scala/li/cil/oc/common/item/ItemTier.scala rename to src/main/scala/li/cil/oc/common/item/traits/ItemTier.scala index c6be84ae4..f85b77247 100644 --- a/src/main/scala/li/cil/oc/common/item/ItemTier.scala +++ b/src/main/scala/li/cil/oc/common/item/traits/ItemTier.scala @@ -1,10 +1,11 @@ -package li.cil.oc.common.item +package li.cil.oc.common.item.traits import java.util import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly import li.cil.oc.Localization +import li.cil.oc.common.item.Delegate import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack