diff --git a/assets/opencomputers/lang/de_DE.lang b/assets/opencomputers/lang/de_DE.lang index a96a6bb81..486ce7a13 100644 --- a/assets/opencomputers/lang/de_DE.lang +++ b/assets/opencomputers/lang/de_DE.lang @@ -30,6 +30,7 @@ oc:item.Memory.name=Speicher oc:item.NetworkCard.name=Netzwerkkarte oc:item.RedstoneCard.name=Redstonekarte oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte +oc:item.IronNugget.name=Eisennugget # GUI oc:gui.Analyzer.Address=Adresse diff --git a/assets/opencomputers/lang/en_US.lang b/assets/opencomputers/lang/en_US.lang index 97b6e6ec8..189b39c49 100644 --- a/assets/opencomputers/lang/en_US.lang +++ b/assets/opencomputers/lang/en_US.lang @@ -34,6 +34,7 @@ oc:item.Memory.name=Memory oc:item.NetworkCard.name=Network Card oc:item.RedstoneCard.name=Redstone Card oc:item.WirelessNetworkCard.name=Wireless Network Card +oc:item.IronNugget.name=Iron Nugget # GUI oc:gui.Analyzer.Address=Address diff --git a/assets/opencomputers/textures/items/iron_nugget.png b/assets/opencomputers/textures/items/iron_nugget.png new file mode 100644 index 000000000..f89f2a21e Binary files /dev/null and b/assets/opencomputers/textures/items/iron_nugget.png differ diff --git a/li/cil/oc/Recipes.scala b/li/cil/oc/Recipes.scala index 48c3b7546..ed51d51ad 100644 --- a/li/cil/oc/Recipes.scala +++ b/li/cil/oc/Recipes.scala @@ -15,6 +15,7 @@ object Recipes { val redstoneDust = new ItemStack(Item.redstone) val comparator = new ItemStack(Item.comparator) val emerald = new ItemStack(Item.emerald) + val goldNugget = new ItemStack(Item.goldNugget) val chip1 = Items.chip1.createItemStack() @@ -213,7 +214,7 @@ object Recipes { addRecipe(chip2, "glg", "cdc", - "glg", 'g', "nuggetGold", 'l', lapis, 'c', chip1, 'd', diamond) + "glg", 'g', goldNugget, 'l', lapis, 'c', chip1, 'd', diamond) addRecipe(chip3, "dmd", diff --git a/li/cil/oc/common/item/Chip.scala b/li/cil/oc/common/item/Chip.scala index 19b1cce2c..0e1a2e658 100644 --- a/li/cil/oc/common/item/Chip.scala +++ b/li/cil/oc/common/item/Chip.scala @@ -5,22 +5,10 @@ import net.minecraft.client.renderer.texture.IconRegister import net.minecraft.item.ItemStack class Chip(val parent: Delegator, val tier: Int) extends Delegate { - val unlocalizedName = "Chip" + val baseName = "Chip" + val unlocalizedName = baseName + Array("Basic", "Advanced", "Professional").apply(tier) + - override def displayName(stack: ItemStack) = { - if (tier == 0) { - Option("Redstone Chip") - } - else if (tier == 1) { - Option("Golden Chip") - } - else if (tier == 2) { - Option("Diamond Chip") - } - else { - Option(unlocalizedName) - } - } override def registerIcons(iconRegister: IconRegister) = { super.registerIcons(iconRegister) diff --git a/li/cil/oc/common/item/IronNugget.scala b/li/cil/oc/common/item/IronNugget.scala index 44558a32a..439284345 100644 --- a/li/cil/oc/common/item/IronNugget.scala +++ b/li/cil/oc/common/item/IronNugget.scala @@ -1,6 +1,15 @@ package li.cil.oc.common.item +import net.minecraft.client.renderer.texture.IconRegister +import li.cil.oc.Settings + class IronNugget (val parent: Delegator) extends Delegate { - val unlocalizedName = "Iron Nugget" + val unlocalizedName = "IronNugget" + + override def registerIcons(iconRegister: IconRegister) = { + super.registerIcons(iconRegister) + + icon = iconRegister.registerIcon(Settings.resourceDomain + ":iron_nugget" ) + } }