Added localization for chiseled armor, and restored backwards compati…

…bility for chiseled diamond armor.

src/main/java/com/phylogeny/extrabitmanipulation/init/ItemsExtraBitManipulation.java

@@ -38,12 +38,12 @@ public static void itemsInit(FMLPreInitializationEvent event)
 				ArmorMovingPart.PELVIS, ArmorMovingPart.LEG_RIGHT, ArmorMovingPart.LEG_LEFT);
 		chiseledBootsDiamond = new ItemChiseledArmor("chiseled_boots", ArmorMaterial.DIAMOND, EntityEquipmentSlot.FEET,
 				ArmorType.BOOTS, ArmorMovingPart.FOOT_RIGHT, ArmorMovingPart.FOOT_LEFT);
-		chiseledHelmetIron = new ItemChiseledArmor("chiseled_helmet", ArmorMaterial.IRON, EntityEquipmentSlot.HEAD, ArmorType.HELMET, ArmorMovingPart.HEAD);
-		chiseledChestplateIron = new ItemChiseledArmor("chiseled_chestplate", ArmorMaterial.IRON, EntityEquipmentSlot.CHEST, ArmorType.CHESTPLATE,
+		chiseledHelmetIron = new ItemChiseledArmor("chiseled_helmet_iron", ArmorMaterial.IRON, EntityEquipmentSlot.HEAD, ArmorType.HELMET, ArmorMovingPart.HEAD);
+		chiseledChestplateIron = new ItemChiseledArmor("chiseled_chestplate_iron", ArmorMaterial.IRON, EntityEquipmentSlot.CHEST, ArmorType.CHESTPLATE,
 				ArmorMovingPart.TORSO, ArmorMovingPart.ARM_RIGHT, ArmorMovingPart.ARM_LEFT);
-		chiseledLeggingsIron = new ItemChiseledArmor("chiseled_leggings", ArmorMaterial.IRON, EntityEquipmentSlot.LEGS, ArmorType.LEGGINGS,
+		chiseledLeggingsIron = new ItemChiseledArmor("chiseled_leggings_iron", ArmorMaterial.IRON, EntityEquipmentSlot.LEGS, ArmorType.LEGGINGS,
 				ArmorMovingPart.PELVIS, ArmorMovingPart.LEG_RIGHT, ArmorMovingPart.LEG_LEFT);
-		chiseledBootsIron = new ItemChiseledArmor("chiseled_boots", ArmorMaterial.IRON, EntityEquipmentSlot.FEET,
+		chiseledBootsIron = new ItemChiseledArmor("chiseled_boots_iron", ArmorMaterial.IRON, EntityEquipmentSlot.FEET,
 				ArmorType.BOOTS, ArmorMovingPart.FOOT_RIGHT, ArmorMovingPart.FOOT_LEFT);
 		diamondNugget = new ItemExtraBitManipulationBase("diamond_nugget");
 		bitWrench = new ItemBitWrench("bit_wrench");

src/main/java/com/phylogeny/extrabitmanipulation/item/ItemChiseledArmor.java

@@ -77,7 +77,7 @@ public class ItemChiseledArmor extends ItemArmor
 	public ItemChiseledArmor(String name, ArmorMaterial material, EntityEquipmentSlot equipmentSlot, ArmorType armorType, ArmorMovingPart... movingParts)
 	{
 		super(material, 0, equipmentSlot);
-		setRegistryName(name + "_" + material.toString().toLowerCase());
+		setRegistryName(name);
 		setUnlocalizedName(getRegistryName().toString());
 		setCreativeTab(CreativeTabExtraBitManipulation.CREATIVE_TAB);
 		this.armorType = armorType;

src/main/resources/assets/extrabitmanipulation/lang/en_US.lang

@@ -30,10 +30,14 @@ item.extrabitmanipulation:sculpting_loop_head.name=Curved Sculpting Wire Head
 item.extrabitmanipulation:sculpting_square_head.name=Straight Sculpting Wire Head
 item.extrabitmanipulation:sculpting_spade_curved_head.name=Curved Sculpting Spade Head
 item.extrabitmanipulation:sculpting_spade_squared_head.name=Flat Sculpting Spade Head
-item.extrabitmanipulation:chiseled_helmet.name=Chiseled Helmet
-item.extrabitmanipulation:chiseled_chestplate.name=Chiseled Chestplate
-item.extrabitmanipulation:chiseled_leggings.name=Chiseled Leggings
-item.extrabitmanipulation:chiseled_boots.name=Chiseled Boots
+item.extrabitmanipulation:chiseled_helmet.name=Chiseled Diamond Helmet
+item.extrabitmanipulation:chiseled_chestplate.name=Chiseled Diamond Chestplate
+item.extrabitmanipulation:chiseled_leggings.name=Chiseled Diamond Leggings
+item.extrabitmanipulation:chiseled_boots.name=Chiseled Diamond Boots
+item.extrabitmanipulation:chiseled_helmet_iron.name=Chiseled Iron Helmet
+item.extrabitmanipulation:chiseled_chestplate_iron.name=Chiseled Iron Chestplate
+item.extrabitmanipulation:chiseled_leggings_iron.name=Chiseled Iron Leggings
+item.extrabitmanipulation:chiseled_boots_iron.name=Chiseled Iron Boots
 
 jei.extrabitmanipulation.category.shape=C&B Sculpting Shapes
 jei.extrabitmanipulation.category.model=Modeling

src/main/resources/assets/extrabitmanipulation/models/item/chiseled_boots_default.json

@@ -1,4 +1,5 @@
 { "source": "[120, -38, 99, 98, 18, -56, -51, -52, 75, 77, 46, 74, 76, 43, 81, 53, 118, 76, -52, 44, -78, 103, -112, 66, 22, 73, -55, 76, -52, -51, -49, 75, -119, 79, -54, -55, 79, -50, -74, 103, 88, -64, -72, -122, -79, 14, 9, 48, 96, 1, 78, 78, 117, 117, 78, 80, 48, 16, -14, -56, -18, 3, 0, 13, 9, 43, 49]",
+"textures": {"layer0": "minecraft:blocks/diamond_block"},
 "elements": [
 { "from": [1,0,5], "to": [7,0,11], "faces": { "down":  { "uv": [1,5,7,11], "texture": "#layer0", "cullface": "down" } } },
 { "from": [9,0,5], "to": [15,0,11], "faces": { "down":  { "uv": [9,5,15,11], "texture": "#layer0", "cullface": "down" } } },

src/main/resources/assets/extrabitmanipulation/models/item/chiseled_chestplate_default.json

@@ -1,4 +1,5 @@
 { "source": "[120, -38, 99, 98, 18, -56, -51, -52, 75, 77, 46, 74, 76, 43, 81, 53, 118, 76, -52, 44, -78, 103, -112, 66, 22, 73, -55, 76, -52, -51, -49, 75, -119, 79, -54, -55, 79, -50, -74, 103, 88, -63, -72, -125, 81, -2, 7, -1, 7, -7, 31, 16, -8, 31, 9, 48, 64, -127, 0, 7, 8, 67, 96, 3, -29, 4, -50, 6, -58, 6, -58, 63, -10, 13, -116, -12, -112, 103, 127, -64, -64, -128, -51, 125, 127, -20, -1, -43, 3, 0, 24, 8, 70, -28]",
+"textures": {"layer0": "minecraft:blocks/diamond_block"},
 "elements": [
 { "from": [0,16,5], "to": [16,16,6], "faces": { "up":  { "uv": [0,5,16,6], "texture": "#layer0", "cullface": "up" } } },
 { "from": [0,16,6], "to": [6,16,11], "faces": { "up":  { "uv": [0,6,6,11], "texture": "#layer0", "cullface": "up" } } },

src/main/resources/assets/extrabitmanipulation/models/item/chiseled_helmet_default.json

@@ -1,4 +1,5 @@
 { "source": "[120, -38, 99, 98, 18, -56, -51, -52, 75, 77, 46, 74, 76, 43, 81, 53, 118, 76, -52, 44, -78, 103, -112, 66, 22, 73, -55, 76, -52, -51, -49, 75, -119, 79, -54, -55, 79, -50, -74, 103, 40, -40, -64, 36, -1, -125, -7, -128, -4, 15, 4, 100, -64, 2, 4, 56, 32, 80, -2, -121, 0, -57, -64, -56, 67, -44, 12, -108, -68, 96, 7, 99, 3, 44, 124, 0, -79, -22, 42, -25]",
+"textures": {"layer0": "minecraft:blocks/diamond_block"},
 "elements": [
 { "from": [3,16,3], "to": [13,16,13], "faces": { "up":  { "uv": [3,3,13,13], "texture": "#layer0", "cullface": "up" } } },
 { "from": [4,10,4], "to": [4,15,8], "faces": { "east":  { "uv": [8,1,12,6], "texture": "#layer0" } } },

src/main/resources/assets/extrabitmanipulation/models/item/chiseled_leggings_default.json

@@ -1,4 +1,5 @@
 { "source": "[120, -38, 99, 98, 18, -56, -51, -52, 75, 77, 46, 74, 76, 43, 81, 53, 118, 76, -52, 44, -78, 103, -112, 66, 22, 73, -55, 76, -52, -51, -49, 75, -119, 79, -54, -55, 79, -50, -74, 103, 88, -64, 120, -128, -47, -82, 6, 19, -38, -1, 1, 97, 8, 84, 114, -63, -124, -54, 71, -108, 92, 20, 88, 32, -112, -42, -14, -124, -36, 7, 0, 2, -31, 68, -29]",
+"textures": {"layer0": "minecraft:blocks/diamond_block"},
 "elements": [
 { "from": [2,0,5], "to": [7,0,6], "faces": { "down":  { "uv": [2,10,7,11], "texture": "#layer0", "cullface": "down" } } },
 { "from": [9,0,5], "to": [14,0,6], "faces": { "down":  { "uv": [9,10,14,11], "texture": "#layer0", "cullface": "down" } } },