Skip to content

Commit

Permalink
Fix naming of some items
Browse files Browse the repository at this point in the history
  • Loading branch information
@simon816
simon816 committed Jun 14, 2014
1 parent 28984f8 commit cc79fb7
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 52 deletions.
102 changes: 51 additions & 51 deletions resources/assets/projectred/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,34 +96,34 @@ item.projectred.transportation.pipe|6.name=Routed Firewall pipe

itemGroup.exploration=Project Red: Exploration

tile.projectred.exploration.ore.oreruby.name=Ruby Ore
tile.projectred.exploration.ore.oresapphire.name=Sapphire Ore
tile.projectred.exploration.ore.oreperidot.name=Peridot Ore
tile.projectred.exploration.stone.stonemarble.name=Marble
tile.projectred.exploration.stone.brickmarble.name=Marble Brick
tile.projectred.exploration.stone.cobblebasalt.name=Basalt Cobblestone
tile.projectred.exploration.stone.stonebasalt.name=Basalt
tile.projectred.exploration.stone.brickbasalt.name=Basalt Brick
tile.projectred.exploration.stone.storageruby.name=Block of Ruby
tile.projectred.exploration.stone.storagesapphire.name=Block of Sapphire
tile.projectred.exploration.stone.storageperidot.name=Block of Peridot
tile.projectred.exploration.ore|0.name=Ruby Ore
tile.projectred.exploration.ore|1.name=Sapphire Ore
tile.projectred.exploration.ore|2.name=Peridot Ore
tile.projectred.exploration.stone|0.name=Marble
tile.projectred.exploration.stone|1.name=Marble Brick
tile.projectred.exploration.stone|2.name=Basalt Cobblestone
tile.projectred.exploration.stone|3.name=Basalt
tile.projectred.exploration.stone|4.name=Basalt Brick
tile.projectred.exploration.stone|5.name=Block of Ruby
tile.projectred.exploration.stone|6.name=Block of Sapphire
tile.projectred.exploration.stone|7.name=Block of Peridot
item.projectred.exploration.woolgin.name=Wool Gin
item.projectred.exploration.backpack.bpwhite.name=White Backpack
item.projectred.exploration.backpack.bporange.name=Orange Backpack
item.projectred.exploration.backpack.bpmagenta.name=Magenta Backpack
item.projectred.exploration.backpack.bplightblue.name=Light Blue Backpack
item.projectred.exploration.backpack.bpyellow.name=Yellow Backpack
item.projectred.exploration.backpack.bplime.name=Lime Backpack
item.projectred.exploration.backpack.bppink.name=Pink Backpack
item.projectred.exploration.backpack.bpgrey.name=Grey Backpack
item.projectred.exploration.backpack.bplightgrey.name=Light Grey Backpack
item.projectred.exploration.backpack.bpcyan.name=Cyan Backpack
item.projectred.exploration.backpack.bppurple.name=Purple Backpack
item.projectred.exploration.backpack.bpblue.name=Blue Backpack
item.projectred.exploration.backpack.bpbrown.name=Brown Backpack
item.projectred.exploration.backpack.bpgreen.name=Green Backpack
item.projectred.exploration.backpack.bpred.name=Red Backpack
item.projectred.exploration.backpack.bpblack.name=Black Backpack
item.projectred.exploration.backpack|0.name=White Backpack
item.projectred.exploration.backpack|1.name=Orange Backpack
item.projectred.exploration.backpack|2.name=Magenta Backpack
item.projectred.exploration.backpack|3.name=Light Blue Backpack
item.projectred.exploration.backpack|4.name=Yellow Backpack
item.projectred.exploration.backpack|5.name=Lime Backpack
item.projectred.exploration.backpack|6.name=Pink Backpack
item.projectred.exploration.backpack|7.name=Grey Backpack
item.projectred.exploration.backpack|8.name=Light Grey Backpack
item.projectred.exploration.backpack|9.name=Cyan Backpack
item.projectred.exploration.backpack|10.name=Purple Backpack
item.projectred.exploration.backpack|11.name=Blue Backpack
item.projectred.exploration.backpack|12=Brown Backpack
item.projectred.exploration.backpack|13.name=Green Backpack
item.projectred.exploration.backpack|14.name=Red Backpack
item.projectred.exploration.backpack|15.name=Black Backpack
item.projectred.exploration.axeruby.name=Ruby Axe
item.projectred.exploration.axesapphire.name=Sapphire Axe
item.projectred.exploration.axeperidot.name=Peridot Axe
Expand Down Expand Up @@ -155,14 +155,14 @@ item.projectred.exploration.sickleruby.name=Ruby Sickle
item.projectred.exploration.sicklesapphire.name=Sapphire Sickle
item.projectred.exploration.sickleperidot.name=Peridot Sickle
item.projectred.exploration.sicklediamond.name=Diamond Sickle
tile.projectred.exploration.stone.stonemarblewall.name=Marble Wall
tile.projectred.exploration.stone.brickmarblewall.name=Marble Brick Wall
tile.projectred.exploration.stone.cobblebasaltwall.name=Basalt Cobblestone Wall
tile.projectred.exploration.stone.stonebasaltwall.name=Basalt Wall
tile.projectred.exploration.stone.brickbasaltwall.name=Basalt Brick Wall
tile.projectred.exploration.stone.storagerubywall.name=Ruby Wall
tile.projectred.exploration.stone.storagesapphirewall.name=Sapphire Wall
tile.projectred.exploration.stone.storageperidotwall.name=Peridot Wall
tile.projectred.exploration.stonewalls|0.name=Marble Wall
tile.projectred.exploration.stonewalls|1.name=Marble Brick Wall
tile.projectred.exploration.stonewalls|2.name=Basalt Cobblestone Wall
tile.projectred.exploration.stonewalls|3.name=Basalt Wall
tile.projectred.exploration.stonewalls|4.name=Basalt Brick Wall
tile.projectred.exploration.stonewalls|5.name=Ruby Wall
tile.projectred.exploration.stonewalls|6.name=Sapphire Wall
tile.projectred.exploration.stonewalls|7.name=Peridot Wall
tile.projectred.exploration.dyeleaf|0.name=White Stained Leaf
tile.projectred.exploration.dyeleaf|1.name=Orange Stained Leaf
tile.projectred.exploration.dyeleaf|2.name=Magenta Stained Leaf
Expand Down Expand Up @@ -250,22 +250,22 @@ tile.projectred.illumination.lamp|12.name=Brown Lamp
tile.projectred.illumination.lamp|13.name=Green Lamp
tile.projectred.illumination.lamp|14.name=Red Lamp
tile.projectred.illumination.lamp|15.name=Black Lamp
tile.projectred.illumination.lamp.inv|0.name=Inverted White Lamp
tile.projectred.illumination.lamp.inv|1.name=Inverted Orange Lamp
tile.projectred.illumination.lamp.inv|2.name=Inverted Magenta Lamp
tile.projectred.illumination.lamp.inv|3.name=Inverted Light Blue Lamp
tile.projectred.illumination.lamp.inv|4.name=Inverted Yellow Lamp
tile.projectred.illumination.lamp.inv|5.name=Inverted Lime Lamp
tile.projectred.illumination.lamp.inv|6.name=Inverted Pink Lamp
tile.projectred.illumination.lamp.inv|7.name=Inverted Grey Lamp
tile.projectred.illumination.lamp.inv|8.name=Inverted Light Grey Lamp
tile.projectred.illumination.lamp.inv|9.name=Inverted Cyan Lamp
tile.projectred.illumination.lamp.inv|10.name=Inverted Purple Lamp
tile.projectred.illumination.lamp.inv|11.name=Inverted Blue Lamp
tile.projectred.illumination.lamp.inv|12.name=Inverted Brown Lamp
tile.projectred.illumination.lamp.inv|13.name=Inverted Green Lamp
tile.projectred.illumination.lamp.inv|14.name=Inverted Red Lamp
tile.projectred.illumination.lamp.inv|15.name=Inverted Black Lamp
tile.projectred.illumination.lamp|16.name=Inverted White Lamp
tile.projectred.illumination.lamp|17.name=Inverted Orange Lamp
tile.projectred.illumination.lamp|18.name=Inverted Magenta Lamp
tile.projectred.illumination.lamp|19.name=Inverted Light Blue Lamp
tile.projectred.illumination.lamp|20.name=Inverted Yellow Lamp
tile.projectred.illumination.lamp|21.name=Inverted Lime Lamp
tile.projectred.illumination.lamp|22.name=Inverted Pink Lamp
tile.projectred.illumination.lamp|23.name=Inverted Grey Lamp
tile.projectred.illumination.lamp|24.name=Inverted Light Grey Lamp
tile.projectred.illumination.lamp|25.name=Inverted Cyan Lamp
tile.projectred.illumination.lamp|26.name=Inverted Purple Lamp
tile.projectred.illumination.lamp|27.name=Inverted Blue Lamp
tile.projectred.illumination.lamp|28.name=Inverted Brown Lamp
tile.projectred.illumination.lamp|29.name=Inverted Green Lamp
tile.projectred.illumination.lamp|30.name=Inverted Red Lamp
tile.projectred.illumination.lamp|31.name=Inverted Black Lamp
item.projectred.illumination.lightbutton|0.name=White Illumar Button
item.projectred.illumination.lightbutton|1.name=Orange Illumar Button
item.projectred.illumination.lightbutton|2.name=Magenta Illumar Button
Expand Down
10 changes: 9 additions & 1 deletion src/mrtjp/projectred/core/items.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ class ItemPart extends ItemCore("projectred.core.part")
if (col != null) col.icon
else null
}

override def getUnlocalizedName(stack: ItemStack):String = {
val col = PartDefs(stack.getItemDamage())
if (col != null) getUnlocalizedName() + "." + col.name
else super.getUnlocalizedName(stack)
}
}

object PartDefs extends ItemDefinition
Expand Down Expand Up @@ -147,7 +153,9 @@ object PartDefs extends ItemDefinition
{
icon = reg.registerIcon("projectred:parts/"+iconName)
}
}

override def name = iconName
}
}

class ItemScrewdriver extends ItemCore("projectred.core.screwdriver") with IScrewdriver
Expand Down

0 comments on commit cc79fb7

Please sign in to comment.