From 2a14a4f1d1fda9dbb83e9455666fa43f2ffc4d28 Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Sun, 5 Oct 2014 15:05:47 +0200 Subject: [PATCH] Quite a bit of things :D --- Changelog.txt | 5 +- .../module/vanilla/VanillaItemsRegistry.java | 24 ++-- .../module/vanilla/VanillaItemstacks.java | 28 ++++ .../vanilla/VanillaRecipesRegistry.java | 82 +++++++---- .../vanilla/items/ItemCraftingComponent.java | 128 +++++++++++++++--- .../assets/electromagictools/lang/en_US.lang | 28 ++++ 6 files changed, 241 insertions(+), 54 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 11fe9c0..1757a0f 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,7 +1,10 @@ Changelog of the mod : Electric Magic Tools, a Thaumcraft 4/Industrial-Craft 2 addon -------------------------------------------------------------------------------------------------------------------------------------------------------- -Version 2.0.0.Alpha4: +Version 2.0.0Alpa5: +Wild Material Shards have appeared! They are used in the tools' crafting recipes :D. + +Version 2.0.0Alpha4: Added some items to the vanilla module of the mod: Wooden, Stone, Iron, Golden and Diamond Drills. Added Wooden, Stone, Iron, Golden and Diamond Chainsaws. Added Iron, Golden and Diamond Omnitools. diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java index 5e4d114..df0582a 100644 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java +++ b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java @@ -73,22 +73,30 @@ public class VanillaItemsRegistry { bronzeDrill = new ItemVanillaDrill(bronzeMaterial, 650, ":drill_bronze", OreDictionary.getOres("ingotBronze").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.bronze"); GameRegistry.registerItem(bronzeDrill, "bronzeDrill"); - woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":woodenChainsaw", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".chainsaw.wood"); + woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":chainsaw_wooden", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".chainsaw.wood"); GameRegistry.registerItem(woodenChainsaw, "woodenChainsaw"); - stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":stoneChainsaw", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".chainsaw.stone"); + stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":chainsaw_stone", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".chainsaw.stone"); GameRegistry.registerItem(stoneChainsaw, "stoneChainsaw"); - ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":ironChainsaw", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".chainsaw.iron"); + ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":chainsaw_iron", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".chainsaw.iron"); GameRegistry.registerItem(ironChainsaw, "ironChainsaw"); - goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":goldenChainsaw", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".chainsaw.gold"); + goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":chainsaw_gold", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".chainsaw.gold"); GameRegistry.registerItem(goldenChainsaw, "goldenChainsaw"); - diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":diamondChainsaw", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); + diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":chainsaw_diamond", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); GameRegistry.registerItem(diamondChainsaw, "diamondChainsaw"); - ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":ironOmnitool", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); + ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":omnitool_iron", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); GameRegistry.registerItem(ironOmnitool, "ironOmnitool"); - goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":goldenOmnitool", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.gold"); + goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":omnitool_gold", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.gold"); GameRegistry.registerItem(goldenOmnitool, "goldenOmnitool"); - diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":diamondOmnitool", Items.diamond).setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); + diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":omnitool_diamond", Items.diamond).setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); GameRegistry.registerItem(diamondOmnitool, "diamondOmnitool"); + copperOmnitool = new ItemVanillaOmnitool(copperMaterial, 850, "omnitool_copper", OreDictionary.getOres("ingotCopper").get(0).getItem()).setUnlocalizedName(ModInformation.modid + ".omnitool.copper"); + GameRegistry.registerItem(copperOmnitool, "copperOmnitool"); + tinOmnitool = new ItemVanillaOmnitool(tinMaterial, 640, "omnitool_tin", OreDictionary.getOres("ingotTin").get(0).getItem()).setUnlocalizedName(ModInformation.modid + ".omnitool.tin"); + GameRegistry.registerItem(tinOmnitool, "tinOmnitool"); + leadOmnitool = new ItemVanillaOmnitool(leadMaterial, 700, "omnitool_lead", OreDictionary.getOres("ingotLead").get(0).getItem()).setUnlocalizedName(ModInformation.modid + ".omnitool.lead"); + GameRegistry.registerItem(leadOmnitool, "leadOmnitool"); + bronzeOmnitool = new ItemVanillaOmnitool(bronzeMaterial, 950, "omnitool_bronze", OreDictionary.getOres("ingotBronze").get(0).getItem()).setUnlocalizedName(ModInformation.modid + ".omnitool.bronze"); + GameRegistry.registerItem(bronzeOmnitool, "bronzeOmnitool"); } } \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemstacks.java b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemstacks.java index de759f1..5384a23 100644 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemstacks.java +++ b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemstacks.java @@ -40,4 +40,32 @@ public class VanillaItemstacks { public static ItemStack tinDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 6); public static ItemStack leadDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 7); public static ItemStack bronzeDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 8); + + public static ItemStack woodenChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 9); + public static ItemStack stoneChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 10); + public static ItemStack ironChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 11); + public static ItemStack goldenChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 12); + public static ItemStack diamondChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 13); + public static ItemStack copperChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 14); + public static ItemStack tinChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 15); + public static ItemStack leadChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 16); + public static ItemStack bronzeChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 17); + + public static ItemStack ironOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 18); + public static ItemStack goldenOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 19); + public static ItemStack diamondOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 20); + public static ItemStack copperOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 21); + public static ItemStack tinOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 22); + public static ItemStack leadOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 23); + public static ItemStack bronzeOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 24); + + public static ItemStack woodenShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 25); + public static ItemStack stoneShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 26); + public static ItemStack ironShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 27); + public static ItemStack goldenShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 28); + public static ItemStack obsidianShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 29); + public static ItemStack copperShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 30); + public static ItemStack tinShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 31); + public static ItemStack leadShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 32); + public static ItemStack bronzeShard = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 33); } diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaRecipesRegistry.java b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaRecipesRegistry.java index eb5c4b3..61d373b 100644 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaRecipesRegistry.java +++ b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaRecipesRegistry.java @@ -10,15 +10,16 @@ import net.minecraftforge.oredict.OreDictionary; public class VanillaRecipesRegistry { public static IRecipe woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; - public static IRecipe woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw; - public static IRecipe ironOmnitool, goldenOmnitool, diamondOmnitool; - public static IRecipe woodenTop, stoneTop, ironTop, goldenTop, diamondTop, copperTop, tinTop, leadTop, bronzeTop; + public static IRecipe woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; + public static IRecipe ironOmnitool, goldenOmnitool, diamondOmnitool, copperOmnitool, tinOmnitool, leadOmnitool, bronzeOmnitool; + public static IRecipe woodenDrillTop, stoneDrillTop, ironDrillTop, goldenDrillTop, diamondDrillTop, copperDrillTop, tinDrillTop, leadDrillTop, bronzeDrillTop; + public static IRecipe woodenChainsawTop, stoneChainsawTop, ironChainsawTop, goldenChainsawTop, diamondChainsawTop, copperChainsawTop, tinChainsawTop, leadChainsawTop, bronzeChainsawTop; public static void registerRecipes() { addMiscRecipes(); addDrillTopRecipes(); - addDrillRecipes(); - addChainsawRecipes(); + addDrillRecipe(); + addChainsawTopRecipes(); addChainsawRecipes(); } @@ -26,43 +27,61 @@ public class VanillaRecipesRegistry { } public static void addDrillTopRecipes() { - woodenTop = drillTopRecipe(VanillaItemstacks.woodenDrillTop, "plankWood"); - stoneTop = drillTopRecipe(VanillaItemstacks.stoneDrillTop, "stone"); - ironTop = drillTopRecipe(VanillaItemstacks.ironDrillTop, "ingotIron"); - goldenTop = drillTopRecipe(VanillaItemstacks.goldenDrillTop, "ingotGold"); - diamondTop = drillTopRecipe(VanillaItemstacks.diamondDrillTop, "gemDiamond"); - copperTop = drillTopRecipe(VanillaItemstacks.copperDrillTop, "ingotCopper"); - tinTop = drillTopRecipe(VanillaItemstacks.tinDrillTop, "ingotTin"); - leadTop = drillTopRecipe(VanillaItemstacks.leadDrillTop, "ingotLead"); - bronzeTop = drillTopRecipe(VanillaItemstacks.bronzeDrillTop, "ingotBronze"); + woodenDrillTop = drillTopRecipe(VanillaItemstacks.woodenDrillTop, "plankWood", VanillaItemstacks.woodenShard); + stoneDrillTop = drillTopRecipe(VanillaItemstacks.stoneDrillTop, "stone", VanillaItemstacks.stoneShard); + ironDrillTop = drillTopRecipe(VanillaItemstacks.ironDrillTop, "ingotIron", VanillaItemstacks.ironShard); + goldenDrillTop = drillTopRecipe(VanillaItemstacks.goldenDrillTop, "ingotGold", VanillaItemstacks.goldenShard); + diamondDrillTop = drillTopRecipe(VanillaItemstacks.diamondDrillTop, "gemDiamond", VanillaItemstacks.obsidianShard); + copperDrillTop = drillTopRecipe(VanillaItemstacks.copperDrillTop, "ingotCopper", VanillaItemstacks.copperShard); + tinDrillTop = drillTopRecipe(VanillaItemstacks.tinDrillTop, "ingotTin", VanillaItemstacks.tinShard); + leadDrillTop = drillTopRecipe(VanillaItemstacks.leadDrillTop, "ingotLead", VanillaItemstacks.leadShard); + bronzeDrillTop = drillTopRecipe(VanillaItemstacks.bronzeDrillTop, "ingotBronze", VanillaItemstacks.bronzeShard); } public static void addChainsawTopRecipes() { + woodenChainsawTop = chainsawTopRecipe(VanillaItemstacks.woodenChainsawTop, "plankWood", VanillaItemstacks.woodenShard); + stoneChainsawTop = chainsawTopRecipe(VanillaItemstacks.stoneChainsawTop, "stone", VanillaItemstacks.stoneShard); + ironChainsawTop = chainsawTopRecipe(VanillaItemstacks.ironChainsawTop, "ingotIron", VanillaItemstacks.ironShard); + goldenChainsawTop = chainsawTopRecipe(VanillaItemstacks.goldenChainsawTop, "ingotGold", VanillaItemstacks.goldenShard); + diamondChainsawTop = chainsawTopRecipe(VanillaItemstacks.diamondChainsawTop, "gemDiamond", VanillaItemstacks.obsidianShard); + copperChainsawTop = chainsawTopRecipe(VanillaItemstacks.copperChainsawTop, "ingotCopper", VanillaItemstacks.copperShard); + tinChainsawTop = chainsawTopRecipe(VanillaItemstacks.tinChainsawTop, "ingotTin", VanillaItemstacks.tinShard); + leadChainsawTop = chainsawTopRecipe(VanillaItemstacks.leadChainsawTop, "ingotLead", VanillaItemstacks.leadShard); + bronzeDrill = chainsawTopRecipe(VanillaItemstacks.bronzeChainsawTop, "ingotBronze", VanillaItemstacks.bronzeShard); } - public static void addDrillRecipes() { - woodenDrill = drillRecipe(VanillaItemstacks.woodenDrill, VanillaItemstacks.woodenDrillTop, "plankWood", "stickWood"); - stoneDrill = drillRecipe(VanillaItemstacks.stoneDrill, VanillaItemstacks.stoneDrillTop, "stone", "cobblestone"); - ironDrill = drillRecipe(VanillaItemstacks.ironDrill, VanillaItemstacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather)); - goldenDrill = drillRecipe(VanillaItemstacks.goldenDrill, VanillaItemstacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian)); - diamondDrill = drillRecipe(VanillaItemstacks.diamondDrill, VanillaItemstacks.diamondDrillTop, "gemDiamond", "ingotGold"); - copperDrill = drillRecipe(VanillaItemstacks.copperDrill, VanillaItemstacks.copperDrillTop, "ingotCopper", "ingotTin"); - tinDrill = drillRecipe(VanillaItemstacks.tinDrill, VanillaItemstacks.tinDrillTop, "ingotTin", "ingotGold"); - leadDrill = drillRecipe(VanillaItemstacks.leadDrill, VanillaItemstacks.leadDrillTop, "ingotLead", "ingotIron"); - bronzeDrill = drillRecipe(VanillaItemstacks.bronzeDrill, VanillaItemstacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian)); + public static void addDrillRecipe() { + woodenDrill = toolRecipe(VanillaItemstacks.woodenDrill, VanillaItemstacks.woodenDrillTop, "plankWood", "stickWood"); + stoneDrill = toolRecipe(VanillaItemstacks.stoneDrill, VanillaItemstacks.stoneDrillTop, "stone", "cobblestone"); + ironDrill = toolRecipe(VanillaItemstacks.ironDrill, VanillaItemstacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather)); + goldenDrill = toolRecipe(VanillaItemstacks.goldenDrill, VanillaItemstacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian)); + diamondDrill = toolRecipe(VanillaItemstacks.diamondDrill, VanillaItemstacks.diamondDrillTop, "gemDiamond", "ingotGold"); + copperDrill = toolRecipe(VanillaItemstacks.copperDrill, VanillaItemstacks.copperDrillTop, "ingotCopper", "ingotTin"); + tinDrill = toolRecipe(VanillaItemstacks.tinDrill, VanillaItemstacks.tinDrillTop, "ingotTin", "ingotGold"); + leadDrill = toolRecipe(VanillaItemstacks.leadDrill, VanillaItemstacks.leadDrillTop, "ingotLead", "ingotIron"); + bronzeDrill = toolRecipe(VanillaItemstacks.bronzeDrill, VanillaItemstacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian)); } public static void addChainsawRecipes() { + woodenChainsaw = toolRecipe(VanillaItemstacks.woodenChainsaw, VanillaItemstacks.woodenChainsawTop, "plankWood", "stickWood"); + stoneChainsaw = toolRecipe(VanillaItemstacks.stoneChainsaw, VanillaItemstacks.stoneChainsawTop, "stone", "cobblestone"); + ironChainsaw = toolRecipe(VanillaItemstacks.ironChainsaw, VanillaItemstacks.ironChainsawTop, "ingotIron", new ItemStack(Items.leather)); + goldenChainsaw = toolRecipe(VanillaItemstacks.goldenChainsaw, VanillaItemstacks.goldenChainsawTop, "ingotGold", new ItemStack(Blocks.obsidian)); + diamondChainsaw = toolRecipe(VanillaItemstacks.diamondChainsaw, VanillaItemstacks.diamondChainsawTop, "gemDiamond", "ingotGold"); + copperChainsaw = toolRecipe(VanillaItemstacks.copperChainsaw, VanillaItemstacks.copperChainsawTop, "ingotCopper", "ingotTin"); + tinChainsaw = toolRecipe(VanillaItemstacks.tinChainsaw, VanillaItemstacks.tinChainsawTop, "ingotTin", "ingotGold"); + leadChainsaw = toolRecipe(VanillaItemstacks.leadChainsaw, VanillaItemstacks.leadChainsawTop, "ingotLead", "ingotIron"); + bronzeChainsaw = toolRecipe(VanillaItemstacks.bronzeChainsaw, VanillaItemstacks.bronzeChainsawTop, "ingotBronze", new ItemStack(Blocks.obsidian)); } - public static IRecipe drillRecipe(ItemStack output, ItemStack X, String Y, ItemStack Z) { + public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, ItemStack Z) { for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(i), 'Z', Z); } return null; } - public static IRecipe drillRecipe(ItemStack output, ItemStack X, String Y, String Z) { + public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, String Z) { for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { for (int j = 0; j < OreDictionary.getOres(Z).size(); j++) { return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(j), 'Z', OreDictionary.getOres(Z).get(i)); @@ -71,9 +90,16 @@ public class VanillaRecipesRegistry { return null; } - public static IRecipe drillTopRecipe(ItemStack output, String X) { + public static IRecipe drillTopRecipe(ItemStack output, String X, ItemStack Y) { for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { - return GameRegistry.addShapedRecipe(output, " X ", "XXX", 'X', OreDictionary.getOres(X).get(i)); + return GameRegistry.addShapedRecipe(output, " Y ", "XXX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); + } + return null; + } + + public static IRecipe chainsawTopRecipe(ItemStack output, String X, ItemStack Y) { + for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { + return GameRegistry.addShapedRecipe(output, " Y ", "XYX", "XYX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); } return null; } diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java b/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java index db2424f..4299eee 100644 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java +++ b/src/main/java/tombenpotter/emt/common/module/vanilla/items/ItemCraftingComponent.java @@ -14,9 +14,11 @@ import java.util.List; public class ItemCraftingComponent extends Item { - public IIcon[] icon = new IIcon[17]; + public IIcon[] icon = new IIcon[100]; public final String drillTop = "drillTop"; public final String chainsawTop = "chainsawTop"; + public final String omnitoolTop = "omnitoolTop"; + public final String shard = "shard"; public ItemCraftingComponent() { this.setMaxDamage(0); @@ -64,37 +66,109 @@ public class ItemCraftingComponent extends Item { break; } case 8: { - name = chainsawTop + ".wood"; + name = drillTop + ".bronze"; break; } case 9: { - name = chainsawTop + ".stone"; + name = chainsawTop + ".wood"; break; } case 10: { - name = chainsawTop + ".iron"; + name = chainsawTop + ".stone"; break; } case 11: { - name = chainsawTop + ".gold"; + name = chainsawTop + ".iron"; break; } case 12: { - name = chainsawTop + ".diamond"; + name = chainsawTop + ".gold"; break; } case 13: { - name = chainsawTop + ".copper"; + name = chainsawTop + ".diamond"; break; } case 14: { - name = chainsawTop + ".tin"; + name = chainsawTop + ".copper"; break; } case 15: { + name = chainsawTop + ".tin"; + break; + } + case 16: { name = chainsawTop + ".lead"; break; } + case 17: { + name = chainsawTop + ".bronze"; + break; + } + case 18: { + name = omnitoolTop + ".iron"; + break; + } + case 19: { + name = omnitoolTop + ".gold"; + break; + } + case 20: { + name = omnitoolTop + ".diamond"; + break; + } + case 21: { + name = omnitoolTop + ".copper"; + break; + } + case 22: { + name = omnitoolTop + ".tin"; + break; + } + case 23: { + name = omnitoolTop + ".lead"; + break; + } + case 24: { + name = omnitoolTop + ".bronze"; + break; + } + case 25: { + name = shard + ".wood"; + break; + } + case 26: { + name = shard + ".stone"; + break; + } + case 27: { + name = shard + ".iron"; + break; + } + case 28: { + name = shard + ".gold"; + break; + } + case 29: { + name = shard + ".obsidian"; + break; + } + case 30: { + name = shard + ".copper"; + break; + } + case 31: { + name = shard + ".tin"; + break; + } + case 32: { + name = shard + ".lead"; + break; + } + case 33: { + name = shard + ".bronze"; + break; + } } return getUnlocalizedName() + "." + name; } @@ -109,15 +183,35 @@ public class ItemCraftingComponent extends Item { this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "copper"); this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "tin"); this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "lead"); + this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":materials/" + drillTop + "_" + "bronze"); - this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "wood"); - this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "stone"); - this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "iron"); - this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "gold"); - this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "diamond"); - this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "copper"); - this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "tin"); - this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "lead"); + this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "wood"); + this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "stone"); + this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "iron"); + this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "gold"); + this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "diamond"); + this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "copper"); + this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "tin"); + this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "lead"); + this.icon[17] = ri.registerIcon(ModInformation.texturePath + ":materials/" + chainsawTop + "_" + "bronze"); + + this.icon[18] = ri.registerIcon(ModInformation.texturePath + ":materials/" + omnitoolTop + "_" + "iron"); + this.icon[19] = ri.registerIcon(ModInformation.texturePath + ":materials/" + omnitoolTop + "_" + "gold"); + this.icon[20] = ri.registerIcon(ModInformation.texturePath + ":materials/" + omnitoolTop + "_" + "diamond"); + this.icon[21] = ri.registerIcon(ModInformation.texturePath + ":materials/" + omnitoolTop + "_" + "copper"); + this.icon[22] = ri.registerIcon(ModInformation.texturePath + ":materials/" + omnitoolTop + "_" + "tin"); + this.icon[23] = ri.registerIcon(ModInformation.texturePath + ":materials/" + omnitoolTop + "_" + "lead"); + this.icon[24] = ri.registerIcon(ModInformation.texturePath + ":materials/" + omnitoolTop + "_" + "bronze"); + + this.icon[25] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "wood"); + this.icon[26] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "stone"); + this.icon[27] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "iron"); + this.icon[28] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "gold"); + this.icon[29] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "diamond"); + this.icon[30] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "copper"); + this.icon[31] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "tin"); + this.icon[32] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "lead"); + this.icon[33] = ri.registerIcon(ModInformation.texturePath + ":materials/" + shard + "_" + "bronze"); } @SideOnly(Side.CLIENT) @@ -127,7 +221,7 @@ public class ItemCraftingComponent extends Item { @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { - for (int i = 0; i <= 15; i++) { + for (int i = 0; i <= 33; i++) { list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index c2afa0b..8713613 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -115,10 +115,18 @@ item.EMT.chainsaw.stone.name=Stone Chainsaw item.EMT.chainsaw.iron.name=Iron Chainsaw item.EMT.chainsaw.gold.name=Golden Chainsaw item.EMT.chainsaw.diamond.name=Diamond Chainsaw +item.EMT.chainsaw.copper.name=Copper Chainsaw +item.EMT.chainsaw.tin.name=Tin Chainsaw +item.EMT.chainsaw.lead.name=Lead Chainsaw +item.EMT.chainsaw.bronze.name=Bronze Chainsaw item.EMT.omnitool.iron.name=Iron Omnitool item.EMT.omnitool.gold.name=Golden Omnitool item.EMT.omnitool.diamond.name=Diamond Omnitool +item.EMT.omnitool.copper.name=Copper Omnitool +item.EMT.omnitool.tin.name=Tin Omnitool +item.EMT.omnitool.lead.name=Lead Omnitool +item.EMT.omnitool.bronze.name=Bronze Omnitool item.EMT.material.drillTop.wood.name=Wooden Drill Top item.EMT.material.drillTop.stone.name=Stone Drill Top @@ -128,6 +136,7 @@ item.EMT.material.drillTop.diamond.name=Diamond Drill Top item.EMT.material.drillTop.tin.name=Tin Drill Top item.EMT.material.drillTop.copper.name=Copper Drill Top item.EMT.material.drillTop.lead.name=Lead Drill Top +item.EMT.material.drillTop.bronze.name=Bronze Drill Top item.EMT.material.chainsawTop.wood.name=Wooden Chainsaw Top item.EMT.material.chainsawTop.stone.name=Stone Chainsaw Top @@ -137,6 +146,25 @@ item.EMT.material.chainsawTop.diamond.name=Diamond Chainsaw Top item.EMT.material.chainsawTop.tin.name=Tin Chainsaw Top item.EMT.material.chainsawTop.copper.name=Copper Chainsaw Top item.EMT.material.chainsawTop.lead.name=Lead Chainsaw Top +item.EMT.material.chainsawTop.bronze.name=Bronze Chainsaw Top + +item.EMT.material.omnitoolTop.iron.name=Iron Omnitool Top +item.EMT.material.omnitoolTop.gold.name=Golden Omnitool Top +item.EMT.material.omnitoolTop.diamond.name=Diamond Omnitool Top +item.EMT.material.omnitoolTop.copper.name=Copper Omnitool Top +item.EMT.material.omnitoolTop.tin.name=Tin Omnitool Top +item.EMT.material.omnitoolTop.lead.name=Lead Omnitool Top +item.EMT.material.omnitoolTop.bronze.name=Bronze Omnitool Top + +item.EMT.material.shard.wood.name=Wooden Shard +item.EMT.material.shard.stone.name=Stone Shard +item.EMT.material.shard.iron.name=Iron Shard +item.EMT.material.shard.gold.name=Golden Shard +item.EMT.material.shard.obsidian.name=Obsidian Shard +item.EMT.material.shard.copper.name=Copper Shard +item.EMT.material.shard.tin.name=Tin Shard +item.EMT.material.shard.lead.name=Lead Shard +item.EMT.material.shard.bronze.name=Bronze Shard #=============Block Names============= tile.EMT.shield.name=Shield Block