A little late, but a type alias for Icon and IconRegister to make porting items and blocks to 1.7 easier from here on out.

src/main/scala/li/cil/oc/common/block/AccessPoint.scala

@@ -7,11 +7,9 @@ import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{Localization, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Adapter.scala

@@ -5,10 +5,8 @@ import java.util
 import li.cil.oc.Settings
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Cable.scala

@@ -11,11 +11,10 @@ import li.cil.oc.common.multipart.CablePart
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.Mods
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.tileentity.TileEntity
-import net.minecraft.util.{AxisAlignedBB, Icon}
+import net.minecraft.util.AxisAlignedBB
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Capacitor.scala

@@ -7,10 +7,8 @@ import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{Localization, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Case.scala

@@ -9,10 +9,8 @@ import li.cil.oc.util.mods.BuildCraft
 import li.cil.oc.util.{Color, Tooltip}
 import li.cil.oc.{Localization, OpenComputers, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.{EnumRarity, ItemStack}
-import net.minecraft.util.Icon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Charger.scala

@@ -11,10 +11,8 @@ import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.BuildCraft
 import li.cil.oc.{Localization, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Delegate.scala

@@ -7,7 +7,6 @@ import cpw.mods.fml.relauncher.{Side, SideOnly}
 import li.cil.oc.common.tileentity
 import li.cil.oc.common.tileentity.traits.Inventory
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.{Entity, EntityLivingBase}
 import net.minecraft.item.{EnumRarity, ItemStack}
@@ -17,6 +16,9 @@ import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 
 trait Delegate {
+  type Icon = net.minecraft.util.Icon
+  type IconRegister = net.minecraft.client.renderer.texture.IconRegister
+
   val unlocalizedName: String
 
   var showInItemList = true

src/main/scala/li/cil/oc/common/block/Disassembler.scala

@@ -6,10 +6,8 @@ import li.cil.oc.client.Textures
 import li.cil.oc.common.{GuiType, tileentity}
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{OpenComputers, Settings}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/DiskDrive.scala

@@ -8,11 +8,9 @@ import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.Mods
 import li.cil.oc.{Localization, OpenComputers, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Geolyzer.scala

@@ -6,10 +6,8 @@ import li.cil.oc.Settings
 import li.cil.oc.client.Textures
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Hologram.scala

@@ -8,10 +8,9 @@ import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{Localization, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.{EnumRarity, ItemStack}
-import net.minecraft.util.{AxisAlignedBB, Icon}
+import net.minecraft.util.AxisAlignedBB
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Keyboard.scala

@@ -7,10 +7,9 @@ import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{Localization, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.{AxisAlignedBB, Icon}
+import net.minecraft.util.AxisAlignedBB
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 import org.lwjgl.opengl.GL11

src/main/scala/li/cil/oc/common/block/MotionSensor.scala

@@ -5,10 +5,8 @@ import java.util
 import li.cil.oc.Settings
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/PowerConverter.scala

@@ -7,10 +7,8 @@ import li.cil.oc.Settings
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.Mods
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/PowerDistributor.scala

@@ -6,10 +6,8 @@ import li.cil.oc.Settings
 import li.cil.oc.client.Textures
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Rack.scala

@@ -7,7 +7,6 @@ import li.cil.oc.client.Textures
 import li.cil.oc.common.{GuiType, tileentity}
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{OpenComputers, Settings}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.world.{IBlockAccess, World}

src/main/scala/li/cil/oc/common/block/Redstone.scala

@@ -6,10 +6,8 @@ import li.cil.oc.Settings
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.Mods
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala

@@ -3,10 +3,9 @@ package li.cil.oc.common.block
 import cpw.mods.fml.relauncher.{Side, SideOnly}
 import li.cil.oc.common.tileentity
 import li.cil.oc.{Blocks, Settings}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.EnumRarity
-import net.minecraft.util.{Icon, MovingObjectPosition}
+import net.minecraft.util.MovingObjectPosition
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/RobotAssembler.scala

@@ -6,10 +6,8 @@ import li.cil.oc.client.Textures
 import li.cil.oc.common.{GuiType, tileentity}
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{OpenComputers, Settings}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/RobotProxy.scala

@@ -11,11 +11,10 @@ import li.cil.oc.server.component.robot
 import li.cil.oc.util.{ItemUtils, Tooltip}
 import li.cil.oc.{Blocks, OpenComputers, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.{Entity, EntityLivingBase}
 import net.minecraft.item.{EnumRarity, ItemStack}
-import net.minecraft.util.{AxisAlignedBB, Icon, MovingObjectPosition, Vec3}
+import net.minecraft.util.{AxisAlignedBB, MovingObjectPosition, Vec3}
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Screen.scala

@@ -9,12 +9,10 @@ import li.cil.oc.util.mods.BuildCraft
 import li.cil.oc.util.{Color, PackedColor, Tooltip}
 import li.cil.oc.{Localization, OpenComputers, Settings}
 import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.Entity
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.projectile.EntityArrow
 import net.minecraft.item.{EnumRarity, ItemStack}
-import net.minecraft.util.Icon
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/block/Switch.scala

@@ -6,10 +6,8 @@ import li.cil.oc.Settings
 import li.cil.oc.client.Textures
 import li.cil.oc.common.tileentity
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
 

src/main/scala/li/cil/oc/common/item/ALU.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala

@@ -5,7 +5,6 @@ import java.util
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.Mods
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Acid.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Analyzer.scala

@@ -6,7 +6,6 @@ import li.cil.oc.api.network._
 import li.cil.oc.server.PacketSender
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{Localization, Settings}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP}
 import net.minecraft.item.ItemStack
 import net.minecraft.world.World

src/main/scala/li/cil/oc/common/item/ArrowKeys.scala

@@ -1,7 +1,6 @@
 package li.cil.oc.common.item
 
 import li.cil.oc.Settings
-import net.minecraft.client.renderer.texture.IconRegister
 
 class ArrowKeys(val parent: Delegator) extends Delegate {
   val unlocalizedName = "ArrowKeys"

src/main/scala/li/cil/oc/common/item/ButtonGroup.scala

@@ -1,7 +1,6 @@
 package li.cil.oc.common.item
 
 import li.cil.oc.Settings
-import net.minecraft.client.renderer.texture.IconRegister
 
 class ButtonGroup(val parent: Delegator) extends Delegate {
   val unlocalizedName = "ButtonGroup"

src/main/scala/li/cil/oc/common/item/CPU.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/CardBase.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/CircuitBoard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/ControlUnit.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/CuttingWire.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Delegate.scala

@@ -3,18 +3,20 @@ package li.cil.oc.common.item
 import java.util
 
 import cpw.mods.fml.relauncher.{Side, SideOnly}
-import li.cil.oc.{Settings, api}
 import li.cil.oc.client.KeyBindings
 import li.cil.oc.util.{ItemCosts, Rarity}
-import net.minecraft.client.renderer.texture.IconRegister
+import li.cil.oc.{Settings, api}
 import net.minecraft.entity.Entity
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.{Icon, StatCollector}
+import net.minecraft.util.StatCollector
 import net.minecraft.world.World
 import org.lwjgl.input
 
 trait Delegate {
+  type Icon = net.minecraft.util.Icon
+  type IconRegister = net.minecraft.client.renderer.texture.IconRegister
+
   val parent: Delegator
 
   val unlocalizedName: String

src/main/scala/li/cil/oc/common/item/Disk.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/FloppyDisk.scala

@@ -2,12 +2,10 @@ package li.cil.oc.common.item
 
 import java.util
 
-import cpw.mods.fml.relauncher.{SideOnly, Side}
+import cpw.mods.fml.relauncher.{Side, SideOnly}
 import li.cil.oc.Settings
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
 
 class FloppyDisk(val parent: Delegator) extends Delegate {
   val unlocalizedName = "FloppyDisk"

src/main/scala/li/cil/oc/common/item/GraphicsCard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.{PackedColor, Tooltip}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala

@@ -3,7 +3,6 @@ package li.cil.oc.common.item
 import java.util
 
 import li.cil.oc.Settings
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/InternetCard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Interweb.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/IronNugget.scala

@@ -5,7 +5,6 @@ import java.util
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.Mods
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/LinkedCard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Memory.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Microchip.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.{Rarity, Tooltip}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/NetworkCard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Numpad.scala

@@ -1,7 +1,6 @@
 package li.cil.oc.common.item
 
 import li.cil.oc.Settings
-import net.minecraft.client.renderer.texture.IconRegister
 
 class NumPad(val parent: Delegator) extends Delegate {
   val unlocalizedName = "NumPad"

src/main/scala/li/cil/oc/common/item/PrintedCircuitBoard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/RawCircuitBoard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/RedstoneCard.scala

@@ -6,7 +6,6 @@ import li.cil.oc.Settings
 import li.cil.oc.common.InventorySlots.Tier
 import li.cil.oc.util.Tooltip
 import li.cil.oc.util.mods.{BundledRedstone, Mods, WirelessRedstone}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/Server.scala

@@ -6,7 +6,6 @@ import li.cil.oc.common.GuiType
 import li.cil.oc.common.inventory.ServerInventory
 import li.cil.oc.util.{Rarity, Tooltip}
 import li.cil.oc.{OpenComputers, Settings}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.world.World

src/main/scala/li/cil/oc/common/item/Tablet.scala

@@ -13,7 +13,6 @@ import li.cil.oc.api.network.{Connector, Message, Node}
 import li.cil.oc.common.GuiType
 import li.cil.oc.common.inventory.ComponentInventory
 import li.cil.oc.{OpenComputers, Settings, api}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.Entity
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack

src/main/scala/li/cil/oc/common/item/Terminal.scala

@@ -8,11 +8,9 @@ import li.cil.oc.common.{GuiType, tileentity}
 import li.cil.oc.server.{PacketSender => ServerPacketSender}
 import li.cil.oc.util.Tooltip
 import li.cil.oc.{OpenComputers, Settings}
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.util.Icon
 import net.minecraft.world.World
 
 class Terminal(val parent: Delegator) extends Delegate {

src/main/scala/li/cil/oc/common/item/Transistor.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala

@@ -2,7 +2,6 @@ package li.cil.oc.common.item
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeSign.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/UpgradeTractorBeam.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 

src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala

@@ -4,7 +4,6 @@ import java.util
 
 import li.cil.oc.Settings
 import li.cil.oc.util.Tooltip
-import net.minecraft.client.renderer.texture.IconRegister
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack