Skip to content

Commit

Permalink
Make @Adaptivity happy
Browse files Browse the repository at this point in the history
  • Loading branch information
bonii-xx committed Oct 16, 2014
1 parent 2b2eaaa commit d80bd63
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 22 deletions.
23 changes: 2 additions & 21 deletions resources/assets/tinker/lang/en_US.lang
Expand Up @@ -544,27 +544,6 @@ death.four.smeltery=%1$s thought swimming in hot liquids was a good idea
death.attack.Landmine=%1$s watched their legs get blown off by a landmine
death.attack.FireworkExplode=%1$s was torn apart by a wild firework explosion

parttype.wood=Wooden
parttype.stone=Stone
parttype.iron=Iron
parttype.flint=Flint
parttype.cactus=Cactus
parttype.bone=Bone
parttype.obsidian=Obsidian
parttype.slime=Slime
parttype.paper=Paper
parttype.netherrack=Netherrack
parttype.cobalt=Cobalt
parttype.ardite=Ardite
parttype.manyullyn=Manyullyn
parttype.copper=Copper
parttype.bronze=Bronze
parttype.alumite=Alumite
parttype.steel=Steel
parttype.blueslime=Slime
parttype.thaumium=Thaumium
parttype.pigiron=Pig Iron

toolpart.ToolRod=%%material Tool Rod
toolpart.PickaxeHead=%%material Pickaxe Head
toolpart.ShovelHead=%%material Shovel Head
Expand Down Expand Up @@ -594,6 +573,8 @@ toolpart.Fletching=%%material Fletching

# Now with translations of specific material and part combinations:
#toolpart.ToolRod.wood=Wooden Tool Rod
# If only the material part has to be specific, you can use this
#toolpart.material.wood=Wooden

fluid.iron.molten=Molten Iron
fluid.gold.molten=Molten Gold
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/tconstruct/library/tools/DynamicToolPart.java
Expand Up @@ -78,7 +78,14 @@ public String getItemStackDisplayName (ItemStack stack)
// general name
else
{
return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", toolmat.prefixName());
// specific material name for materials?
String matName;
if(StatCollector.canTranslate("toolpart.material." + material))
matName = StatCollector.translateToLocal("toolpart.material." + material);
else
matName = toolmat.prefixName();

return StatCollector.translateToLocal("toolpart." + partName).replaceAll("%%material", matName);
}
}

Expand Down

0 comments on commit d80bd63

Please sign in to comment.