From 15ce4d4552e7dba62dc2829a7eb5071cc5bb398e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 1 Dec 2013 00:16:58 +0100 Subject: [PATCH] preliminary cpu, alu and cu graphics; refactored alu class --- assets/opencomputers/textures/items/alu.png | Bin 0 -> 295 bytes assets/opencomputers/textures/items/cpu.png | Bin 0 -> 339 bytes assets/opencomputers/textures/items/cu.png | Bin 0 -> 284 bytes li/cil/oc/Items.scala | 4 ++-- li/cil/oc/common/item/Alu.scala | 10 +++++++++- li/cil/oc/common/item/CPU.scala | 10 +++++++++- li/cil/oc/common/item/ControlUnit.scala | 10 +++++++++- 7 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 assets/opencomputers/textures/items/alu.png create mode 100644 assets/opencomputers/textures/items/cpu.png create mode 100644 assets/opencomputers/textures/items/cu.png diff --git a/assets/opencomputers/textures/items/alu.png b/assets/opencomputers/textures/items/alu.png new file mode 100644 index 0000000000000000000000000000000000000000..98d27a071851487c4d4500b46292b722e6dc5f86 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo;{cx!SAKqeATz~TFx-l-K7d12Rn^?we9xXe$BrFayJpSW z)vIS_%1(&ko;Gb-e}DgyB}@MQ|L+{R_%l$CU`dc)Fp!G^7*yBJOae;gdb&7H>e4iKO6T>!ip5jrxCH9kvSh>h_5FQ)d-m)(eCW{P1q&ML>o;%SJZ;L9vuDr#|Nme6=VlL(5hX!> z!9Xq+!0^oBSsYMFqo<2wNX4y~{@Z*l3Oua*tc(*~_45Az58mFert@-3`$?0955!;e zPqOsiW)v%tyoI6Bqs6FVLEwSk>x<8==GnCP!)$@3tkoxGzpA;Vbw@Wttg2HfiG9A( zA%U0iKQyygWD`~^zFxW{YJDWbPFJO_@L8<)?5A?e_0_F?`gdOQPxS)~; Q2XqXBr>mdKI;Vst0JH*_iU0rr literal 0 HcmV?d00001 diff --git a/assets/opencomputers/textures/items/cu.png b/assets/opencomputers/textures/items/cu.png new file mode 100644 index 0000000000000000000000000000000000000000..a92e0e7d2f0132a3d45a92ecdeb37e223ee9971e GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fovjCqESAKqeAam`SHL9wr=H}*=GcFxFcFZNNFR|^EeRy-* zqH76d^KV?+a`F7~Y15`1J2I)izyJUL|0xIZ9f8_}N`m}?fm~F;@M!;jA)suWr;B4q z#jT!xcfJD#94s3drMFM{UvK83=V)2^-At;J^<8{|Fw5HOehw}j9OrliII8B%XImnY z%$TgQ^3eQ7f$Z!(JnJ3&PF~YEV;P+sv$Jg>ch$8^M!?HbFZ5Gfb N22WQ%mvv4FO#qG!aghK3 literal 0 HcmV?d00001 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") + } }