From 2cde13b7bd842cc06a96ee04f2b8a9014975adbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Mon, 14 Jul 2014 17:19:30 +0200
Subject: [PATCH] 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   | 2 --
 src/main/scala/li/cil/oc/common/block/Adapter.scala       | 2 --
 src/main/scala/li/cil/oc/common/block/Cable.scala         | 3 +--
 src/main/scala/li/cil/oc/common/block/Capacitor.scala     | 2 --
 src/main/scala/li/cil/oc/common/block/Case.scala          | 2 --
 src/main/scala/li/cil/oc/common/block/Charger.scala       | 2 --
 src/main/scala/li/cil/oc/common/block/Delegate.scala      | 4 +++-
 src/main/scala/li/cil/oc/common/block/Disassembler.scala  | 2 --
 src/main/scala/li/cil/oc/common/block/DiskDrive.scala     | 2 --
 src/main/scala/li/cil/oc/common/block/Geolyzer.scala      | 2 --
 src/main/scala/li/cil/oc/common/block/Hologram.scala      | 3 +--
 src/main/scala/li/cil/oc/common/block/Keyboard.scala      | 3 +--
 src/main/scala/li/cil/oc/common/block/MotionSensor.scala  | 2 --
 .../scala/li/cil/oc/common/block/PowerConverter.scala     | 2 --
 .../scala/li/cil/oc/common/block/PowerDistributor.scala   | 2 --
 src/main/scala/li/cil/oc/common/block/Rack.scala          | 1 -
 src/main/scala/li/cil/oc/common/block/Redstone.scala      | 2 --
 .../scala/li/cil/oc/common/block/RobotAfterimage.scala    | 3 +--
 .../scala/li/cil/oc/common/block/RobotAssembler.scala     | 2 --
 src/main/scala/li/cil/oc/common/block/RobotProxy.scala    | 3 +--
 src/main/scala/li/cil/oc/common/block/Screen.scala        | 2 --
 src/main/scala/li/cil/oc/common/block/Switch.scala        | 2 --
 src/main/scala/li/cil/oc/common/item/ALU.scala            | 1 -
 .../scala/li/cil/oc/common/item/AbstractBusCard.scala     | 1 -
 src/main/scala/li/cil/oc/common/item/Acid.scala           | 1 -
 src/main/scala/li/cil/oc/common/item/Analyzer.scala       | 1 -
 src/main/scala/li/cil/oc/common/item/ArrowKeys.scala      | 1 -
 src/main/scala/li/cil/oc/common/item/ButtonGroup.scala    | 1 -
 src/main/scala/li/cil/oc/common/item/CPU.scala            | 1 -
 src/main/scala/li/cil/oc/common/item/CardBase.scala       | 1 -
 src/main/scala/li/cil/oc/common/item/CircuitBoard.scala   | 1 -
 src/main/scala/li/cil/oc/common/item/ControlUnit.scala    | 1 -
 src/main/scala/li/cil/oc/common/item/CuttingWire.scala    | 1 -
 src/main/scala/li/cil/oc/common/item/Delegate.scala       | 8 +++++---
 src/main/scala/li/cil/oc/common/item/Disk.scala           | 1 -
 src/main/scala/li/cil/oc/common/item/FloppyDisk.scala     | 4 +---
 src/main/scala/li/cil/oc/common/item/GraphicsCard.scala   | 1 -
 src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala  | 1 -
 src/main/scala/li/cil/oc/common/item/InternetCard.scala   | 1 -
 src/main/scala/li/cil/oc/common/item/Interweb.scala       | 1 -
 src/main/scala/li/cil/oc/common/item/IronNugget.scala     | 1 -
 src/main/scala/li/cil/oc/common/item/LinkedCard.scala     | 1 -
 src/main/scala/li/cil/oc/common/item/Memory.scala         | 1 -
 src/main/scala/li/cil/oc/common/item/Microchip.scala      | 1 -
 src/main/scala/li/cil/oc/common/item/NetworkCard.scala    | 1 -
 src/main/scala/li/cil/oc/common/item/Numpad.scala         | 1 -
 .../scala/li/cil/oc/common/item/PrintedCircuitBoard.scala | 1 -
 .../scala/li/cil/oc/common/item/RawCircuitBoard.scala     | 1 -
 src/main/scala/li/cil/oc/common/item/RedstoneCard.scala   | 1 -
 src/main/scala/li/cil/oc/common/item/Server.scala         | 1 -
 src/main/scala/li/cil/oc/common/item/Tablet.scala         | 1 -
 src/main/scala/li/cil/oc/common/item/Terminal.scala       | 2 --
 src/main/scala/li/cil/oc/common/item/Transistor.scala     | 1 -
 src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala   | 1 -
 src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala | 1 -
 .../scala/li/cil/oc/common/item/UpgradeChunkloader.scala  | 1 -
 .../li/cil/oc/common/item/UpgradeContainerCard.scala      | 1 -
 .../li/cil/oc/common/item/UpgradeContainerUpgrade.scala   | 1 -
 .../scala/li/cil/oc/common/item/UpgradeCrafting.scala     | 1 -
 .../scala/li/cil/oc/common/item/UpgradeExperience.scala   | 1 -
 .../scala/li/cil/oc/common/item/UpgradeGenerator.scala    | 1 -
 .../scala/li/cil/oc/common/item/UpgradeInventory.scala    | 1 -
 .../cil/oc/common/item/UpgradeInventoryController.scala   | 1 -
 .../scala/li/cil/oc/common/item/UpgradeNavigation.scala   | 1 -
 src/main/scala/li/cil/oc/common/item/UpgradeSign.scala    | 1 -
 .../li/cil/oc/common/item/UpgradeSolarGenerator.scala     | 1 -
 .../scala/li/cil/oc/common/item/UpgradeTractorBeam.scala  | 1 -
 .../scala/li/cil/oc/common/item/WirelessNetworkCard.scala | 1 -
 68 files changed, 14 insertions(+), 93 deletions(-)

diff --git a/src/main/scala/li/cil/oc/common/block/AccessPoint.scala b/src/main/scala/li/cil/oc/common/block/AccessPoint.scala
index 78da0ef30..379cd4eba 100644
--- a/src/main/scala/li/cil/oc/common/block/AccessPoint.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Adapter.scala b/src/main/scala/li/cil/oc/common/block/Adapter.scala
index 34fe19900..107d83667 100644
--- a/src/main/scala/li/cil/oc/common/block/Adapter.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Cable.scala b/src/main/scala/li/cil/oc/common/block/Cable.scala
index d4f0a8ba5..28452409b 100644
--- a/src/main/scala/li/cil/oc/common/block/Cable.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Capacitor.scala b/src/main/scala/li/cil/oc/common/block/Capacitor.scala
index 882ee329f..cedb04970 100644
--- a/src/main/scala/li/cil/oc/common/block/Capacitor.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Case.scala b/src/main/scala/li/cil/oc/common/block/Case.scala
index cbab72bb4..82b1e6b31 100644
--- a/src/main/scala/li/cil/oc/common/block/Case.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Charger.scala b/src/main/scala/li/cil/oc/common/block/Charger.scala
index cd490777e..89b09eadf 100644
--- a/src/main/scala/li/cil/oc/common/block/Charger.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Delegate.scala b/src/main/scala/li/cil/oc/common/block/Delegate.scala
index e4c78c69a..213fdd698 100644
--- a/src/main/scala/li/cil/oc/common/block/Delegate.scala
+++ b/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
diff --git a/src/main/scala/li/cil/oc/common/block/Disassembler.scala b/src/main/scala/li/cil/oc/common/block/Disassembler.scala
index 997a7a25d..7c6ff8c9a 100644
--- a/src/main/scala/li/cil/oc/common/block/Disassembler.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/DiskDrive.scala b/src/main/scala/li/cil/oc/common/block/DiskDrive.scala
index 7573bdd6e..156aaacf2 100644
--- a/src/main/scala/li/cil/oc/common/block/DiskDrive.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Geolyzer.scala b/src/main/scala/li/cil/oc/common/block/Geolyzer.scala
index 2f2bbf3e2..5f0e288b1 100644
--- a/src/main/scala/li/cil/oc/common/block/Geolyzer.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Hologram.scala b/src/main/scala/li/cil/oc/common/block/Hologram.scala
index 2f7c4dcfc..3e63d2ccd 100644
--- a/src/main/scala/li/cil/oc/common/block/Hologram.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Keyboard.scala b/src/main/scala/li/cil/oc/common/block/Keyboard.scala
index eea818362..bb21a2f9f 100644
--- a/src/main/scala/li/cil/oc/common/block/Keyboard.scala
+++ b/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
diff --git a/src/main/scala/li/cil/oc/common/block/MotionSensor.scala b/src/main/scala/li/cil/oc/common/block/MotionSensor.scala
index 5faf0503e..6b68c024b 100644
--- a/src/main/scala/li/cil/oc/common/block/MotionSensor.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala
index b334c979f..e8b1441db 100644
--- a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/PowerDistributor.scala b/src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
index 8f026b253..394370fa9 100644
--- a/src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Rack.scala b/src/main/scala/li/cil/oc/common/block/Rack.scala
index 5482eaad0..6d3612105 100644
--- a/src/main/scala/li/cil/oc/common/block/Rack.scala
+++ b/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}
diff --git a/src/main/scala/li/cil/oc/common/block/Redstone.scala b/src/main/scala/li/cil/oc/common/block/Redstone.scala
index 6d6d479b6..ce0bd6850 100644
--- a/src/main/scala/li/cil/oc/common/block/Redstone.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala b/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
index 6b24b3f8e..fc8b3a561 100644
--- a/src/main/scala/li/cil/oc/common/block/RobotAfterimage.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/RobotAssembler.scala b/src/main/scala/li/cil/oc/common/block/RobotAssembler.scala
index 00a45d3b2..0a50c48f8 100644
--- a/src/main/scala/li/cil/oc/common/block/RobotAssembler.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala b/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
index 06b991ef9..9ab03ec74 100644
--- a/src/main/scala/li/cil/oc/common/block/RobotProxy.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Screen.scala b/src/main/scala/li/cil/oc/common/block/Screen.scala
index da00b4dca..3ac13b842 100644
--- a/src/main/scala/li/cil/oc/common/block/Screen.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/block/Switch.scala b/src/main/scala/li/cil/oc/common/block/Switch.scala
index de24ab361..323ef9354 100644
--- a/src/main/scala/li/cil/oc/common/block/Switch.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/ALU.scala b/src/main/scala/li/cil/oc/common/item/ALU.scala
index 914e46912..ac4342493 100644
--- a/src/main/scala/li/cil/oc/common/item/ALU.scala
+++ b/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
 
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 33bb69526..1438f0359 100644
--- a/src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/Acid.scala b/src/main/scala/li/cil/oc/common/item/Acid.scala
index 5f68ffdb5..1c259883a 100644
--- a/src/main/scala/li/cil/oc/common/item/Acid.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/Analyzer.scala b/src/main/scala/li/cil/oc/common/item/Analyzer.scala
index a221b4504..d535d3f49 100644
--- a/src/main/scala/li/cil/oc/common/item/Analyzer.scala
+++ b/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
diff --git a/src/main/scala/li/cil/oc/common/item/ArrowKeys.scala b/src/main/scala/li/cil/oc/common/item/ArrowKeys.scala
index 4eec99441..535004a7a 100644
--- a/src/main/scala/li/cil/oc/common/item/ArrowKeys.scala
+++ b/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"
diff --git a/src/main/scala/li/cil/oc/common/item/ButtonGroup.scala b/src/main/scala/li/cil/oc/common/item/ButtonGroup.scala
index 11627d456..27e53c51e 100644
--- a/src/main/scala/li/cil/oc/common/item/ButtonGroup.scala
+++ b/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"
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 44dc088eb..676832866 100644
--- a/src/main/scala/li/cil/oc/common/item/CPU.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/CardBase.scala b/src/main/scala/li/cil/oc/common/item/CardBase.scala
index a9641ac0f..667ac591d 100644
--- a/src/main/scala/li/cil/oc/common/item/CardBase.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/CircuitBoard.scala b/src/main/scala/li/cil/oc/common/item/CircuitBoard.scala
index 640814869..3f5b3306e 100644
--- a/src/main/scala/li/cil/oc/common/item/CircuitBoard.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/ControlUnit.scala b/src/main/scala/li/cil/oc/common/item/ControlUnit.scala
index 7d1f919a9..ed2494da8 100644
--- a/src/main/scala/li/cil/oc/common/item/ControlUnit.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/CuttingWire.scala b/src/main/scala/li/cil/oc/common/item/CuttingWire.scala
index 097bd1d64..54f47eabf 100644
--- a/src/main/scala/li/cil/oc/common/item/CuttingWire.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/Delegate.scala b/src/main/scala/li/cil/oc/common/item/Delegate.scala
index ad05246c6..e8129af5e 100644
--- a/src/main/scala/li/cil/oc/common/item/Delegate.scala
+++ b/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
diff --git a/src/main/scala/li/cil/oc/common/item/Disk.scala b/src/main/scala/li/cil/oc/common/item/Disk.scala
index 65becae0c..9000e2476 100644
--- a/src/main/scala/li/cil/oc/common/item/Disk.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala b/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
index 719b8700e..786062dbf 100644
--- a/src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
+++ b/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"
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 0ce2379da..060a92cca 100644
--- a/src/main/scala/li/cil/oc/common/item/GraphicsCard.scala
+++ b/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
 
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 bf35f2fa4..a9cd05d28 100644
--- a/src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala
+++ b/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
 
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 970f92eae..5fc8328e6 100644
--- a/src/main/scala/li/cil/oc/common/item/InternetCard.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/Interweb.scala b/src/main/scala/li/cil/oc/common/item/Interweb.scala
index ec68e9f88..8bd464d16 100644
--- a/src/main/scala/li/cil/oc/common/item/Interweb.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/IronNugget.scala b/src/main/scala/li/cil/oc/common/item/IronNugget.scala
index 94947800c..7ba419b2b 100644
--- a/src/main/scala/li/cil/oc/common/item/IronNugget.scala
+++ b/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
 
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 1d5d42df2..7c36513e9 100644
--- a/src/main/scala/li/cil/oc/common/item/LinkedCard.scala
+++ b/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
 
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 8ff5d8fff..9c66b2bf1 100644
--- a/src/main/scala/li/cil/oc/common/item/Memory.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/Microchip.scala b/src/main/scala/li/cil/oc/common/item/Microchip.scala
index 202334c62..10d8cb5d2 100644
--- a/src/main/scala/li/cil/oc/common/item/Microchip.scala
+++ b/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
 
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 de43269d4..9055e368a 100644
--- a/src/main/scala/li/cil/oc/common/item/NetworkCard.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/Numpad.scala b/src/main/scala/li/cil/oc/common/item/Numpad.scala
index f8e430910..e14aea79e 100644
--- a/src/main/scala/li/cil/oc/common/item/Numpad.scala
+++ b/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"
diff --git a/src/main/scala/li/cil/oc/common/item/PrintedCircuitBoard.scala b/src/main/scala/li/cil/oc/common/item/PrintedCircuitBoard.scala
index 8e652ee78..7b2632326 100644
--- a/src/main/scala/li/cil/oc/common/item/PrintedCircuitBoard.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/RawCircuitBoard.scala b/src/main/scala/li/cil/oc/common/item/RawCircuitBoard.scala
index 0033df24c..2d35dac0f 100644
--- a/src/main/scala/li/cil/oc/common/item/RawCircuitBoard.scala
+++ b/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
 
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 170383918..a60f7af0d 100644
--- a/src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
+++ b/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
 
diff --git a/src/main/scala/li/cil/oc/common/item/Server.scala b/src/main/scala/li/cil/oc/common/item/Server.scala
index 439e1aff2..8a17288cc 100644
--- a/src/main/scala/li/cil/oc/common/item/Server.scala
+++ b/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
diff --git a/src/main/scala/li/cil/oc/common/item/Tablet.scala b/src/main/scala/li/cil/oc/common/item/Tablet.scala
index 01f0447a7..f6fac379a 100644
--- a/src/main/scala/li/cil/oc/common/item/Tablet.scala
+++ b/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
diff --git a/src/main/scala/li/cil/oc/common/item/Terminal.scala b/src/main/scala/li/cil/oc/common/item/Terminal.scala
index 0146598b0..cdc1a9e49 100644
--- a/src/main/scala/li/cil/oc/common/item/Terminal.scala
+++ b/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 {
diff --git a/src/main/scala/li/cil/oc/common/item/Transistor.scala b/src/main/scala/li/cil/oc/common/item/Transistor.scala
index 35377fd7a..41448a279 100644
--- a/src/main/scala/li/cil/oc/common/item/Transistor.scala
+++ b/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
 
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 1f00d97f6..cf6c5cdb4 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala
+++ b/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
 
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 71d74e832..c19337180 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala
+++ b/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
 
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 0c5e24847..11e79d5a9 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala
+++ b/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
 
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 8b4d03fd7..91427125a 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala
+++ b/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
 
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 396f5f155..a59b2ea12 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala
+++ b/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
 
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 85e92be57..03a91a1b5 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala
+++ b/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
 
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 f1d00ed62..5cc2febb7 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala
+++ b/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
 
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 be006502c..4686031f0 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala
+++ b/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
 
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 9237cf4fc..fd71149c9 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala
+++ b/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
 
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 3ad0873eb..cd7927652 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.scala
+++ b/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
 
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 b7a11e9ca..7944c4fda 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala
+++ b/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
 
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 1aabf3350..d6db4b9f1 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeSign.scala
+++ b/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
 
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 061fa88b2..b45da6216 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala
+++ b/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
 
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 aed9de37e..928cf3df3 100644
--- a/src/main/scala/li/cil/oc/common/item/UpgradeTractorBeam.scala
+++ b/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
 
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 d41b56232..9884178d6 100644
--- a/src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala
+++ b/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