diff --git a/assets/microblock/lang/en_US.lang b/assets/microblock/lang/en_US.lang index bfed266..49efa9f 100644 --- a/assets/microblock/lang/en_US.lang +++ b/assets/microblock/lang/en_US.lang @@ -1,4 +1,32 @@ item.microblock:sawStone.name=Stone Saw item.microblock:sawIron.name=Iron Saw item.microblock:sawDiamond.name=Diamond Saw -item.microblock:stoneRod.name=Stone Rod \ No newline at end of file +item.microblock:stoneRod.name=Stone Rod + +mcr_face.1.name=%s Cover +mcr_face.1.subset=Cover +mcr_face.2.name=%s Panel +mcr_face.2.subset=Panel +mcr_face.4.name=%s Slab +mcr_face.4.subset=Slab + +mcr_hllw.1.name=Hollow %s Cover +mcr_hllw.1.subset=Hollow Cover +mcr_hllw.2.name=Hollow %s Panel +mcr_hllw.2.subset=Hollow Panel +mcr_hllw.4.name=Hollow %s Slab +mcr_hllw.4.subset=Hollow Slab + +mcr_edge.1.name=%s Strip +mcr_edge.1.subset=Strip +mcr_edge.2.name=%s Post +mcr_edge.2.subset=Post +mcr_edge.4.name=%s Pillar +mcr_edge.4.subset=Pillar + +mcr_cnr.1.name=%s Nook +mcr_cnr.1.subset=Nook +mcr_cnr.2.name=%s Corner +mcr_cnr.2.subset=Corner +mcr_cnr.4.name=%s Notch +mcr_cnr.4.subset=Notch \ No newline at end of file diff --git a/assets/microblock/lang/es_ES.lang b/assets/microblock/lang/es_ES.lang index f31eb44..01b84c3 100644 --- a/assets/microblock/lang/es_ES.lang +++ b/assets/microblock/lang/es_ES.lang @@ -1,4 +1,4 @@ item.microblock:sawStone.name=Sierra de Piedra item.microblock:sawIron.name=Sierra de Hierro item.microblock:sawDiamond.name=Sierra de Diamante -item.microblock:stoneRod.name=Palo de Piedra +item.microblock:stoneRod.name=Palo de Piedra \ No newline at end of file diff --git a/codechicken/microblock/CornerMicroblock.scala b/codechicken/microblock/CornerMicroblock.scala index 3e4ee45..15af852 100644 --- a/codechicken/microblock/CornerMicroblock.scala +++ b/codechicken/microblock/CornerMicroblock.scala @@ -49,13 +49,6 @@ object CornerMicroClass extends MicroblockClass new CornerMicroblock(size, slot, material) def placementProperties = CornerPlacement - - def getDisplayName(size:Int):String = size match - { - case 1 => "Nook" - case 2 => "Corner" - case 4 => "Notch" - } } class CornerMicroblockClient(shape$:Byte = 0, material$:Int = 0) extends CornerMicroblock(shape$, material$) with CommonMicroblockClient diff --git a/codechicken/microblock/EdgeMicroblock.scala b/codechicken/microblock/EdgeMicroblock.scala index 251116e..280b28e 100644 --- a/codechicken/microblock/EdgeMicroblock.scala +++ b/codechicken/microblock/EdgeMicroblock.scala @@ -102,13 +102,6 @@ object EdgeMicroClass extends MicroblockClass new EdgeMicroblock(size, slot, material) def placementProperties = EdgePlacement - - def getDisplayName(size:Int):String = size match - { - case 1 => "Strip" - case 2 => "Post" - case 4 => "Pillar" - } } class EdgeMicroblockClient(shape$:Byte = 0, material$:Int = 0) extends EdgeMicroblock(shape$, material$) with CommonMicroblockClient diff --git a/codechicken/microblock/FaceMicroblock.scala b/codechicken/microblock/FaceMicroblock.scala index 7a0eff9..89013b4 100644 --- a/codechicken/microblock/FaceMicroblock.scala +++ b/codechicken/microblock/FaceMicroblock.scala @@ -70,13 +70,6 @@ object FaceMicroClass extends MicroblockClass new FaceMicroblock(size, slot, material) def placementProperties = FacePlacement - - def getDisplayName(size:Int):String = size match - { - case 1 => "Cover" - case 2 => "Panel" - case 4 => "Slab" - } } class FaceMicroblockClient(shape$:Byte = 0, material$:Int = 0) extends FaceMicroblock(shape$, material$) with CommonMicroblockClient diff --git a/codechicken/microblock/HolloMicroblock.scala b/codechicken/microblock/HolloMicroblock.scala index 5bd04ee..73ef76c 100644 --- a/codechicken/microblock/HolloMicroblock.scala +++ b/codechicken/microblock/HolloMicroblock.scala @@ -74,8 +74,6 @@ object HollowMicroClass extends MicroblockClass new HollowMicroblock(size, slot, material) def placementProperties = HollowPlacement - - def getDisplayName(size:Int) = "Hollow "+FaceMicroClass.getDisplayName(size) } class HollowMicroblockClient(shape$:Byte = 0, material$:Int = 0) extends HollowMicroblock(shape$, material$) with CommonMicroblockClient diff --git a/codechicken/microblock/ItemMicroPart.scala b/codechicken/microblock/ItemMicroPart.scala index 4de9499..0dcf579 100644 --- a/codechicken/microblock/ItemMicroPart.scala +++ b/codechicken/microblock/ItemMicroPart.scala @@ -23,6 +23,7 @@ import codechicken.lib.raytracer.RayTracer import net.minecraft.util.EnumMovingObjectType import codechicken.lib.vec.Vector3 import codechicken.lib.render.TextureUtils +import codechicken.lib.lang.LangUtil class ItemMicroPart(id:Int) extends Item(id) { @@ -36,7 +37,7 @@ class ItemMicroPart(id:Int) extends Item(id) if(material == null || mcrClass == null) return "Unnamed" - return material.getLocalizedName+" "+mcrClass.getDisplayName(size) + return LangUtil.translateG(mcrClass.getName+"."+size+".name", material.getLocalizedName) } override def getSubItems(id:Int, tab:CreativeTabs, list$:List[_]) diff --git a/codechicken/microblock/MicroClass.scala b/codechicken/microblock/MicroClass.scala index edb9e08..3e1dee0 100644 --- a/codechicken/microblock/MicroClass.scala +++ b/codechicken/microblock/MicroClass.scala @@ -16,8 +16,6 @@ trait MicroblockClass { var classID:Int = _ - def getDisplayName(size:Int):String - def itemSlot() = 3 @SideOnly(Side.CLIENT) diff --git a/codechicken/multipart/nei/NEI_MicroblockConfig.java b/codechicken/multipart/nei/NEI_MicroblockConfig.java index 194fbee..1f5f00e 100644 --- a/codechicken/multipart/nei/NEI_MicroblockConfig.java +++ b/codechicken/multipart/nei/NEI_MicroblockConfig.java @@ -1,5 +1,6 @@ package codechicken.multipart.nei; +import codechicken.lib.lang.LangUtil; import codechicken.microblock.MicroblockClass; import codechicken.microblock.MicroblockClassRegistry; import codechicken.microblock.handler.MicroblockProxy; @@ -29,7 +30,8 @@ public class NEI_MicroblockConfig implements IConfigureNEI private void addSubset(MicroblockClass mcrClass, int microID, int i) { - API.addSetRange("Microblocks."+mcrClass.getDisplayName(i&0xFF), new MultiItemRange().add(microID, i, i)); + API.addSetRange("Microblocks."+LangUtil.translateG(mcrClass.getName()+"."+(i&0xFF)+".subset"), + new MultiItemRange().add(microID, i, i)); } @Override