diff --git a/assets/opencomputers/textures/items/alu.png b/assets/opencomputers/textures/items/alu.png new file mode 100644 index 000000000..98d27a071 Binary files /dev/null and b/assets/opencomputers/textures/items/alu.png differ diff --git a/assets/opencomputers/textures/items/cpu.png b/assets/opencomputers/textures/items/cpu.png new file mode 100644 index 000000000..2b70d46ef Binary files /dev/null and b/assets/opencomputers/textures/items/cpu.png differ diff --git a/assets/opencomputers/textures/items/cu.png b/assets/opencomputers/textures/items/cu.png new file mode 100644 index 000000000..a92e0e7d2 Binary files /dev/null and b/assets/opencomputers/textures/items/cu.png differ diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala index 2c4212365..84f7ec5dc 100644 --- a/li/cil/oc/Items.scala +++ b/li/cil/oc/Items.scala @@ -45,7 +45,7 @@ object Items { var buttonGroup: item.ButtonGroup = null var cpu: item.CPU = null var transistor : item.Transistor = null - var alu : item.Alu = null + var alu : item.ALU = null var cu : item.ControlUnit = null var ironNugget : item.IronNugget = null @@ -91,7 +91,7 @@ object Items { cpu = new item.CPU(multi) transistor = new item.Transistor(multi) - alu = new item.Alu(multi) + alu = new item.ALU(multi) cu = new item.ControlUnit(multi) ironNugget = new item.IronNugget(multi) diff --git a/li/cil/oc/common/item/Alu.scala b/li/cil/oc/common/item/Alu.scala index 139567f29..4ae6a7fee 100644 --- a/li/cil/oc/common/item/Alu.scala +++ b/li/cil/oc/common/item/Alu.scala @@ -1,6 +1,14 @@ package li.cil.oc.common.item +import li.cil.oc.Settings +import net.minecraft.client.renderer.texture.IconRegister -class Alu (val parent: Delegator) extends Delegate { +class ALU(val parent: Delegator) extends Delegate { val unlocalizedName = "ALU" + + override def registerIcons(iconRegister: IconRegister) { + super.registerIcons(iconRegister) + + icon = iconRegister.registerIcon(Settings.resourceDomain + ":alu") + } } diff --git a/li/cil/oc/common/item/CPU.scala b/li/cil/oc/common/item/CPU.scala index e12d04339..0594ed674 100644 --- a/li/cil/oc/common/item/CPU.scala +++ b/li/cil/oc/common/item/CPU.scala @@ -1,7 +1,15 @@ package li.cil.oc.common.item +import li.cil.oc.Settings +import net.minecraft.client.renderer.texture.IconRegister -class CPU (val parent: Delegator) extends Delegate { +class CPU(val parent: Delegator) extends Delegate { val unlocalizedName = "CPU" + + override def registerIcons(iconRegister: IconRegister) { + super.registerIcons(iconRegister) + + icon = iconRegister.registerIcon(Settings.resourceDomain + ":cpu") + } } diff --git a/li/cil/oc/common/item/ControlUnit.scala b/li/cil/oc/common/item/ControlUnit.scala index be24dcdba..eae8e0113 100644 --- a/li/cil/oc/common/item/ControlUnit.scala +++ b/li/cil/oc/common/item/ControlUnit.scala @@ -1,6 +1,14 @@ package li.cil.oc.common.item +import li.cil.oc.Settings +import net.minecraft.client.renderer.texture.IconRegister -class ControlUnit (val parent: Delegator) extends Delegate { +class ControlUnit(val parent: Delegator) extends Delegate { val unlocalizedName = "CU" + + override def registerIcons(iconRegister: IconRegister) { + super.registerIcons(iconRegister) + + icon = iconRegister.registerIcon(Settings.resourceDomain + ":cu") + } }