From 370534cd1e9c2b9c3425eb7abdb38bf4136e72b1 Mon Sep 17 00:00:00 2001 From: fewizz Date: Tue, 24 Feb 2015 18:04:26 +0300 Subject: [PATCH] Update --- .../common/modules/base/BaseItemStacks.java | 60 ++++---- .../modules/base/BaseRecipeRegistry.java | 98 ++++++------ .../modules/base/items/BaseItemRegistry.java | 140 +++++++++--------- .../base/items/foci/ItemChristmasFocus.java | 1 - .../assets/electromagictools/lang/ru_RU.lang | 70 ++++----- 5 files changed, 184 insertions(+), 185 deletions(-) diff --git a/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java b/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java index 66a1ba1..c80d66a 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java @@ -5,33 +5,33 @@ import net.minecraftforge.oredict.OreDictionary; import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; public class BaseItemStacks { - public static ItemStack woodenDrill = new ItemStack(BaseItemRegistry.woodenDrill); - public static ItemStack stoneDrill = new ItemStack(BaseItemRegistry.stoneDrill); - public static ItemStack ironDrill = new ItemStack(BaseItemRegistry.ironDrill); - public static ItemStack goldenDrill = new ItemStack(BaseItemRegistry.goldenDrill); - public static ItemStack diamondDrill = new ItemStack(BaseItemRegistry.diamondDrill); - public static ItemStack copperDrill = new ItemStack(BaseItemRegistry.copperDrill); - public static ItemStack tinDrill = new ItemStack(BaseItemRegistry.tinDrill); - public static ItemStack leadDrill = new ItemStack(BaseItemRegistry.leadDrill); - public static ItemStack bronzeDrill = new ItemStack(BaseItemRegistry.bronzeDrill); + //public static ItemStack woodenDrill = new ItemStack(BaseItemRegistry.woodenDrill); + //public static ItemStack stoneDrill = new ItemStack(BaseItemRegistry.stoneDrill); + //public static ItemStack ironDrill = new ItemStack(BaseItemRegistry.ironDrill); + //public static ItemStack goldenDrill = new ItemStack(BaseItemRegistry.goldenDrill); + //public static ItemStack diamondDrill = new ItemStack(BaseItemRegistry.diamondDrill); + //public static ItemStack copperDrill = new ItemStack(BaseItemRegistry.copperDrill); + //public static ItemStack tinDrill = new ItemStack(BaseItemRegistry.tinDrill); + //public static ItemStack leadDrill = new ItemStack(BaseItemRegistry.leadDrill); + //public static ItemStack bronzeDrill = new ItemStack(BaseItemRegistry.bronzeDrill); - public static ItemStack woodenChainsaw = new ItemStack(BaseItemRegistry.woodenChainsaw); - public static ItemStack stoneChainsaw = new ItemStack(BaseItemRegistry.stoneChainsaw); - public static ItemStack ironChainsaw = new ItemStack(BaseItemRegistry.ironChainsaw); - public static ItemStack goldenChainsaw = new ItemStack(BaseItemRegistry.goldenChainsaw); - public static ItemStack diamondChainsaw = new ItemStack(BaseItemRegistry.diamondChainsaw); - public static ItemStack copperChainsaw = new ItemStack(BaseItemRegistry.copperChainsaw); - public static ItemStack tinChainsaw = new ItemStack(BaseItemRegistry.tinChainsaw); - public static ItemStack leadChainsaw = new ItemStack(BaseItemRegistry.leadChainsaw); - public static ItemStack bronzeChainsaw = new ItemStack(BaseItemRegistry.bronzeChainsaw); + //public static ItemStack woodenChainsaw = new ItemStack(BaseItemRegistry.woodenChainsaw); + //public static ItemStack stoneChainsaw = new ItemStack(BaseItemRegistry.stoneChainsaw); + //public static ItemStack ironChainsaw = new ItemStack(BaseItemRegistry.ironChainsaw); + //public static ItemStack goldenChainsaw = new ItemStack(BaseItemRegistry.goldenChainsaw); + //public static ItemStack diamondChainsaw = new ItemStack(BaseItemRegistry.diamondChainsaw); + //public static ItemStack copperChainsaw = new ItemStack(BaseItemRegistry.copperChainsaw); + //public static ItemStack tinChainsaw = new ItemStack(BaseItemRegistry.tinChainsaw); + //public static ItemStack leadChainsaw = new ItemStack(BaseItemRegistry.leadChainsaw); + //public static ItemStack bronzeChainsaw = new ItemStack(BaseItemRegistry.bronzeChainsaw); - public static ItemStack ironOmnitool = new ItemStack(BaseItemRegistry.ironOmnitool); - public static ItemStack goldenOmnitool = new ItemStack(BaseItemRegistry.goldenOmnitool); - public static ItemStack diamondOmnitool = new ItemStack(BaseItemRegistry.diamondOmnitool); - public static ItemStack copperOmnitool = new ItemStack(BaseItemRegistry.copperOmnitool); - public static ItemStack tinOmnitool = new ItemStack(BaseItemRegistry.tinOmnitool); - public static ItemStack leadOmnitool = new ItemStack(BaseItemRegistry.leadOmnitool); - public static ItemStack bronzeOmnitool = new ItemStack(BaseItemRegistry.bronzeOmnitool); + //public static ItemStack ironOmnitool = new ItemStack(BaseItemRegistry.ironOmnitool); + //public static ItemStack goldenOmnitool = new ItemStack(BaseItemRegistry.goldenOmnitool); + //public static ItemStack diamondOmnitool = new ItemStack(BaseItemRegistry.diamondOmnitool); + //public static ItemStack copperOmnitool = new ItemStack(BaseItemRegistry.copperOmnitool); + //public static ItemStack tinOmnitool = new ItemStack(BaseItemRegistry.tinOmnitool); + //public static ItemStack leadOmnitool = new ItemStack(BaseItemRegistry.leadOmnitool); + //public static ItemStack bronzeOmnitool = new ItemStack(BaseItemRegistry.bronzeOmnitool); public static ItemStack woodenDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 0); public static ItemStack stoneDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 1); @@ -71,9 +71,9 @@ public class BaseItemStacks { public static ItemStack leadShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 32); public static ItemStack bronzeShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 33); - public static ItemStack woodenCarver = new ItemStack(BaseItemRegistry.woodCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack stoneCarver = new ItemStack(BaseItemRegistry.stoneCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack ironCarver = new ItemStack(BaseItemRegistry.ironCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack obsidianCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack diamondCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); + //public static ItemStack woodenCarver = new ItemStack(BaseItemRegistry.woodCarver, 1, OreDictionary.WILDCARD_VALUE); + //public static ItemStack stoneCarver = new ItemStack(BaseItemRegistry.stoneCarver, 1, OreDictionary.WILDCARD_VALUE); + //public static ItemStack ironCarver = new ItemStack(BaseItemRegistry.ironCarver, 1, OreDictionary.WILDCARD_VALUE); + //public static ItemStack obsidianCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); + //public static ItemStack diamondCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); } diff --git a/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java index c878f20..08883b2 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java @@ -30,13 +30,13 @@ public class BaseRecipeRegistry { } public static void addCarversRecipes() { - for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { - woodenCarver = GameRegistry.addShapedRecipe(BaseItemStacks.woodenCarver, " X ", "YYY", 'X', Items.flint, 'Y', OreDictionary.getOres("logWood").get(i)); - } - stoneCarver = GameRegistry.addShapedRecipe(BaseItemStacks.stoneCarver, " X ", "YYY", 'X', Items.flint, 'Y', Blocks.stone); - ironCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.stone); - obsidianCarver = GameRegistry.addShapedRecipe(BaseItemStacks.obsidianCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.obsidian); - diamondCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", "ZZZ", 'X', BaseItemStacks.obsidianShard, 'Y', Items.diamond, 'Z', Blocks.obsidian); + //for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { + // woodenCarver = GameRegistry.addShapedRecipe(BaseItemStacks.woodenCarver, " X ", "YYY", 'X', Items.flint, 'Y', OreDictionary.getOres("logWood").get(i)); + //} + //stoneCarver = GameRegistry.addShapedRecipe(BaseItemStacks.stoneCarver, " X ", "YYY", 'X', Items.flint, 'Y', Blocks.stone); + //ironCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.stone); + //obsidianCarver = GameRegistry.addShapedRecipe(BaseItemStacks.obsidianCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.obsidian); + //diamondCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", "ZZZ", 'X', BaseItemStacks.obsidianShard, 'Y', Items.diamond, 'Z', Blocks.obsidian); } public static void addShardsRecipes() { @@ -91,37 +91,37 @@ public class BaseRecipeRegistry { } public static void addDrillRecipe() { - woodenDrill = toolRecipe(BaseItemStacks.woodenDrill, BaseItemStacks.woodenDrillTop, "plankWood", "stickWood"); - stoneDrill = toolRecipe(BaseItemStacks.stoneDrill, BaseItemStacks.stoneDrillTop, "stone", "cobblestone"); - ironDrill = toolRecipe(BaseItemStacks.ironDrill, BaseItemStacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather)); - goldenDrill = toolRecipe(BaseItemStacks.goldenDrill, BaseItemStacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian)); - diamondDrill = toolRecipe(BaseItemStacks.diamondDrill, BaseItemStacks.diamondDrillTop, "gemDiamond", "ingotGold"); - - if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) - copperDrill = toolRecipe(BaseItemStacks.copperDrill, BaseItemStacks.copperDrillTop, "ingotCopper", "ingotTin"); - if (isOreRegistered("ingotTin")) - tinDrill = toolRecipe(BaseItemStacks.tinDrill, BaseItemStacks.tinDrillTop, "ingotTin", "ingotGold"); - if (isOreRegistered("ingotLead")) - leadDrill = toolRecipe(BaseItemStacks.leadDrill, BaseItemStacks.leadDrillTop, "ingotLead", "ingotIron"); - if (isOreRegistered("ingotBronze")) - bronzeDrill = toolRecipe(BaseItemStacks.bronzeDrill, BaseItemStacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian)); + //woodenDrill = toolRecipe(BaseItemStacks.woodenDrill, BaseItemStacks.woodenDrillTop, "plankWood", "stickWood"); + //stoneDrill = toolRecipe(BaseItemStacks.stoneDrill, BaseItemStacks.stoneDrillTop, "stone", "cobblestone"); + //ironDrill = toolRecipe(BaseItemStacks.ironDrill, BaseItemStacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather)); + //goldenDrill = toolRecipe(BaseItemStacks.goldenDrill, BaseItemStacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian)); + //diamondDrill = toolRecipe(BaseItemStacks.diamondDrill, BaseItemStacks.diamondDrillTop, "gemDiamond", "ingotGold"); + // + //if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) + // copperDrill = toolRecipe(BaseItemStacks.copperDrill, BaseItemStacks.copperDrillTop, "ingotCopper", "ingotTin"); + //if (isOreRegistered("ingotTin")) + // tinDrill = toolRecipe(BaseItemStacks.tinDrill, BaseItemStacks.tinDrillTop, "ingotTin", "ingotGold"); + //if (isOreRegistered("ingotLead")) + // leadDrill = toolRecipe(BaseItemStacks.leadDrill, BaseItemStacks.leadDrillTop, "ingotLead", "ingotIron"); + //if (isOreRegistered("ingotBronze")) + // bronzeDrill = toolRecipe(BaseItemStacks.bronzeDrill, BaseItemStacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian)); } public static void addChainsawRecipes() { - woodenChainsaw = toolRecipe(BaseItemStacks.woodenChainsaw, BaseItemStacks.woodenChainsawTop, "plankWood", "stickWood"); - stoneChainsaw = toolRecipe(BaseItemStacks.stoneChainsaw, BaseItemStacks.stoneChainsawTop, "stone", "cobblestone"); - ironChainsaw = toolRecipe(BaseItemStacks.ironChainsaw, BaseItemStacks.ironChainsawTop, "ingotIron", new ItemStack(Items.leather)); - goldenChainsaw = toolRecipe(BaseItemStacks.goldenChainsaw, BaseItemStacks.goldenChainsawTop, "ingotGold", new ItemStack(Blocks.obsidian)); - diamondChainsaw = toolRecipe(BaseItemStacks.diamondChainsaw, BaseItemStacks.diamondChainsawTop, "gemDiamond", "ingotGold"); - - if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) - copperChainsaw = toolRecipe(BaseItemStacks.copperChainsaw, BaseItemStacks.copperChainsawTop, "ingotCopper", "ingotTin"); - if (isOreRegistered("ingotTin")) - tinChainsaw = toolRecipe(BaseItemStacks.tinChainsaw, BaseItemStacks.tinChainsawTop, "ingotTin", "ingotGold"); - if (isOreRegistered("ingotLead")) - leadChainsaw = toolRecipe(BaseItemStacks.leadChainsaw, BaseItemStacks.leadChainsawTop, "ingotLead", "ingotIron"); - if (isOreRegistered("ingotBronze")) - bronzeChainsaw = toolRecipe(BaseItemStacks.bronzeChainsaw, BaseItemStacks.bronzeChainsawTop, "ingotBronze", new ItemStack(Blocks.obsidian)); + //woodenChainsaw = toolRecipe(BaseItemStacks.woodenChainsaw, BaseItemStacks.woodenChainsawTop, "plankWood", "stickWood"); + //stoneChainsaw = toolRecipe(BaseItemStacks.stoneChainsaw, BaseItemStacks.stoneChainsawTop, "stone", "cobblestone"); + //ironChainsaw = toolRecipe(BaseItemStacks.ironChainsaw, BaseItemStacks.ironChainsawTop, "ingotIron", new ItemStack(Items.leather)); + //goldenChainsaw = toolRecipe(BaseItemStacks.goldenChainsaw, BaseItemStacks.goldenChainsawTop, "ingotGold", new ItemStack(Blocks.obsidian)); + //diamondChainsaw = toolRecipe(BaseItemStacks.diamondChainsaw, BaseItemStacks.diamondChainsawTop, "gemDiamond", "ingotGold"); + // + //if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) + // copperChainsaw = toolRecipe(BaseItemStacks.copperChainsaw, BaseItemStacks.copperChainsawTop, "ingotCopper", "ingotTin"); + //if (isOreRegistered("ingotTin")) + // tinChainsaw = toolRecipe(BaseItemStacks.tinChainsaw, BaseItemStacks.tinChainsawTop, "ingotTin", "ingotGold"); + //if (isOreRegistered("ingotLead")) + // leadChainsaw = toolRecipe(BaseItemStacks.leadChainsaw, BaseItemStacks.leadChainsawTop, "ingotLead", "ingotIron"); + //if (isOreRegistered("ingotBronze")) + // bronzeChainsaw = toolRecipe(BaseItemStacks.bronzeChainsaw, BaseItemStacks.bronzeChainsawTop, "ingotBronze", new ItemStack(Blocks.obsidian)); } public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, ItemStack Z) { @@ -163,23 +163,23 @@ public class BaseRecipeRegistry { } public static void addCarverRecipe(ItemStack output, ItemStack input) { - GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, input); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, input); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, input); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, input); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, input); + //GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, input); + //GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, input); + //GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, input); + //GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, input); + //GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, input); } public static void addCarverRecipe(ItemStack output, String input) { - if (isOreRegistered(input)) { - for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { - GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, OreDictionary.getOres(input).get(i)); - } - } + //if (isOreRegistered(input)) { + // for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { + // GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, OreDictionary.getOres(input).get(i)); + // GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, OreDictionary.getOres(input).get(i)); + // GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, OreDictionary.getOres(input).get(i)); + // GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, OreDictionary.getOres(input).get(i)); + // GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, OreDictionary.getOres(input).get(i)); + // } + //} } public static boolean isOreRegistered(String ore) { diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java index 00d07ed..3830ed4 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java @@ -13,89 +13,89 @@ import tombenpotter.emt.common.modules.base.items.tools.*; public class BaseItemRegistry { - public static Item woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; - public static Item woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; - public static Item ironOmnitool, goldenOmnitool, diamondOmnitool, copperOmnitool, tinOmnitool, leadOmnitool, bronzeOmnitool; - public static Item woodCarver, stoneCarver, ironCarver, obsidianCarver, diamondCarver; + //public static Item woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; + //public static Item woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; + //public static Item ironOmnitool, goldenOmnitool, diamondOmnitool, copperOmnitool, tinOmnitool, leadOmnitool, bronzeOmnitool; + //public static Item woodCarver, stoneCarver, ironCarver, obsidianCarver, diamondCarver; public static Item baseBaubles, materials, craftingComponents; public static Item focusChristmas; - public static Item.ToolMaterial copperMaterial = EnumHelper.addToolMaterial("copperToolMaterial", 2, 300, 6.0F, 2.0F, 14); - public static Item.ToolMaterial tinMaterial = EnumHelper.addToolMaterial("tinToolMatierial", 2, 200, 8.0F, 4F, 18); - public static Item.ToolMaterial leadMaterial = EnumHelper.addToolMaterial("leadToolMaterial", 2, 250, 7.0F, 3F, 15); - public static Item.ToolMaterial bronzeMaterial = EnumHelper.addToolMaterial("bronzeToolMaterial", 2, 350, 7.0F, 3.0F, 16); + //public static Item.ToolMaterial copperMaterial = EnumHelper.addToolMaterial("copperToolMaterial", 2, 300, 6.0F, 2.0F, 14); + //public static Item.ToolMaterial tinMaterial = EnumHelper.addToolMaterial("tinToolMatierial", 2, 200, 8.0F, 4F, 18); + //public static Item.ToolMaterial leadMaterial = EnumHelper.addToolMaterial("leadToolMaterial", 2, 250, 7.0F, 3F, 15); + //public static Item.ToolMaterial bronzeMaterial = EnumHelper.addToolMaterial("bronzeToolMaterial", 2, 350, 7.0F, 3.0F, 16); public static void registerItems() { - craftingComponents = new ItemCraftingComponents("components"); - GameRegistry.registerItem(craftingComponents, "craftingComponents"); + //craftingComponents = new ItemCraftingComponents("components"); + //GameRegistry.registerItem(craftingComponents, "craftingComponents"); baseBaubles = new ItemBaseBaubles(); GameRegistry.registerItem(baseBaubles, "BaseBaubles"); focusChristmas = new ItemChristmasFocus(); GameRegistry.registerItem(focusChristmas, "FocusChristmas"); - woodCarver = new ItemShardCarver(8).setUnlocalizedName(ModInformation.modid + ".carver.wood"); - GameRegistry.registerItem(woodCarver, "woodCarver"); - stoneCarver = new ItemShardCarver(32).setUnlocalizedName(ModInformation.modid + ".carver.stone"); - GameRegistry.registerItem(stoneCarver, "stoneCarver"); - ironCarver = new ItemShardCarver(128).setUnlocalizedName(ModInformation.modid + ".carver.iron"); - GameRegistry.registerItem(ironCarver, "ironCarver"); - obsidianCarver = new ItemShardCarver(256).setUnlocalizedName(ModInformation.modid + ".carver.obsidian"); - GameRegistry.registerItem(obsidianCarver, "obsidianCarver"); - diamondCarver = new ItemShardCarver(1204).setUnlocalizedName(ModInformation.modid + ".carver.diamond"); - GameRegistry.registerItem(diamondCarver, "diamondCarver"); + //woodCarver = new ItemShardCarver(8).setUnlocalizedName(ModInformation.modid + ".carver.wood"); + //GameRegistry.registerItem(woodCarver, "woodCarver"); + //stoneCarver = new ItemShardCarver(32).setUnlocalizedName(ModInformation.modid + ".carver.stone"); + //GameRegistry.registerItem(stoneCarver, "stoneCarver"); + //ironCarver = new ItemShardCarver(128).setUnlocalizedName(ModInformation.modid + ".carver.iron"); + //GameRegistry.registerItem(ironCarver, "ironCarver"); + //obsidianCarver = new ItemShardCarver(256).setUnlocalizedName(ModInformation.modid + ".carver.obsidian"); + //GameRegistry.registerItem(obsidianCarver, "obsidianCarver"); + //diamondCarver = new ItemShardCarver(1204).setUnlocalizedName(ModInformation.modid + ".carver.diamond"); + //GameRegistry.registerItem(diamondCarver, "diamondCarver"); - woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, "drill_wood", new ItemStack(Item.getItemFromBlock(Blocks.planks))).setUnlocalizedName(ModInformation.modid + ".drill.wood"); - GameRegistry.registerItem(woodenDrill, "woodenDrill"); - stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, "drill_stone", new ItemStack(Item.getItemFromBlock(Blocks.cobblestone))).setUnlocalizedName(ModInformation.modid + ".drill.stone"); - GameRegistry.registerItem(stoneDrill, "stoneDrill"); - ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 400, "drill_iron", new ItemStack(Items.iron_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.iron"); - GameRegistry.registerItem(ironDrill, "ironDrill"); - goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, "drill_gold", new ItemStack(Items.gold_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.gold"); - GameRegistry.registerItem(goldenDrill, "goldenDrill"); - diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, "drill_diamond", new ItemStack(Items.diamond)).setUnlocalizedName(ModInformation.modid + ".drill.diamond"); - GameRegistry.registerItem(diamondDrill, "diamondDrill"); - copperDrill = new ItemVanillaDrill(copperMaterial, 450, "drill_copper", OreDictionary.getOres("ingotCopper").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.copper"); - GameRegistry.registerItem(copperDrill, "copperDrill"); - tinDrill = new ItemVanillaDrill(tinMaterial, 350, "drill_tin", OreDictionary.getOres("ingotTin").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.tin"); - GameRegistry.registerItem(tinDrill, "tinDrill"); - leadDrill = new ItemVanillaDrill(leadMaterial, 400, "drill_lead", OreDictionary.getOres("ingotLead").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.lead"); - GameRegistry.registerItem(leadDrill, "leadDrill"); - bronzeDrill = new ItemVanillaDrill(bronzeMaterial, 650, "drill_bronze", OreDictionary.getOres("ingotBronze").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.bronze"); - GameRegistry.registerItem(bronzeDrill, "bronzeDrill"); + //woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, "drill_wood", new ItemStack(Item.getItemFromBlock(Blocks.planks))).setUnlocalizedName(ModInformation.modid + ".drill.wood"); + //GameRegistry.registerItem(woodenDrill, "woodenDrill"); + //stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, "drill_stone", new ItemStack(Item.getItemFromBlock(Blocks.cobblestone))).setUnlocalizedName(ModInformation.modid + ".drill.stone"); + //GameRegistry.registerItem(stoneDrill, "stoneDrill"); + //ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 400, "drill_iron", new ItemStack(Items.iron_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.iron"); + //GameRegistry.registerItem(ironDrill, "ironDrill"); + //goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, "drill_gold", new ItemStack(Items.gold_ingot)).setUnlocalizedName(ModInformation.modid + ".drill.gold"); + //GameRegistry.registerItem(goldenDrill, "goldenDrill"); + //diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, "drill_diamond", new ItemStack(Items.diamond)).setUnlocalizedName(ModInformation.modid + ".drill.diamond"); + //GameRegistry.registerItem(diamondDrill, "diamondDrill"); + //copperDrill = new ItemVanillaDrill(copperMaterial, 450, "drill_copper", OreDictionary.getOres("ingotCopper").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.copper"); + //GameRegistry.registerItem(copperDrill, "copperDrill"); + //tinDrill = new ItemVanillaDrill(tinMaterial, 350, "drill_tin", OreDictionary.getOres("ingotTin").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.tin"); + //GameRegistry.registerItem(tinDrill, "tinDrill"); + //leadDrill = new ItemVanillaDrill(leadMaterial, 400, "drill_lead", OreDictionary.getOres("ingotLead").get(0)).setUnlocalizedName(ModInformation.modid + ".drill.lead"); + //GameRegistry.registerItem(leadDrill, "leadDrill"); + //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, "chainsaw_wooden", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".chainsaw.wood"); - GameRegistry.registerItem(woodenChainsaw, "woodenChainsaw"); - 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, "chainsaw_iron", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".chainsaw.iron"); - GameRegistry.registerItem(ironChainsaw, "ironChainsaw"); - 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, "chainsaw_diamond", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); - GameRegistry.registerItem(diamondChainsaw, "diamondChainsaw"); - copperChainsaw = new ItemVanillaChainsaw(copperMaterial, 450, "chainsaw_copper", OreDictionary.getOres("ingotCopper").get(0).getItem(), 3F).setUnlocalizedName(ModInformation.modid + ".chainsaw.copper"); - GameRegistry.registerItem(copperChainsaw, "copperChainsaw"); - tinChainsaw = new ItemVanillaChainsaw(tinMaterial, 350, "chainsaw_tin", OreDictionary.getOres("ingotTin").get(0).getItem(), 5F).setUnlocalizedName(ModInformation.modid + ".chainsaw.tin"); - GameRegistry.registerItem(tinChainsaw, "tinChainsaw"); - leadChainsaw = new ItemVanillaChainsaw(leadMaterial, 400, "chainsaw_lead", OreDictionary.getOres("ingotLead").get(0).getItem(), 3.5F).setUnlocalizedName(ModInformation.modid + ".chainsaw.lead"); - GameRegistry.registerItem(leadChainsaw, "leadChainsaw"); - bronzeChainsaw = new ItemVanillaChainsaw(bronzeMaterial, 650, "chainsaw_bronze", OreDictionary.getOres("ingotBronze").get(0).getItem(), 4F).setUnlocalizedName(ModInformation.modid + ".chainsaw.bronze"); - GameRegistry.registerItem(bronzeChainsaw, "bronzeChainsaw"); + //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, "chainsaw_stone", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".chainsaw.stone"); + //GameRegistry.registerItem(stoneChainsaw, "stoneChainsaw"); + //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, "chainsaw_gold", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".chainsaw.gold"); + //GameRegistry.registerItem(goldenChainsaw, "goldenChainsaw"); + //diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, "chainsaw_diamond", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); + //GameRegistry.registerItem(diamondChainsaw, "diamondChainsaw"); + //copperChainsaw = new ItemVanillaChainsaw(copperMaterial, 450, "chainsaw_copper", OreDictionary.getOres("ingotCopper").get(0).getItem(), 3F).setUnlocalizedName(ModInformation.modid + ".chainsaw.copper"); + //GameRegistry.registerItem(copperChainsaw, "copperChainsaw"); + //tinChainsaw = new ItemVanillaChainsaw(tinMaterial, 350, "chainsaw_tin", OreDictionary.getOres("ingotTin").get(0).getItem(), 5F).setUnlocalizedName(ModInformation.modid + ".chainsaw.tin"); + //GameRegistry.registerItem(tinChainsaw, "tinChainsaw"); + //leadChainsaw = new ItemVanillaChainsaw(leadMaterial, 400, "chainsaw_lead", OreDictionary.getOres("ingotLead").get(0).getItem(), 3.5F).setUnlocalizedName(ModInformation.modid + ".chainsaw.lead"); + //GameRegistry.registerItem(leadChainsaw, "leadChainsaw"); + //bronzeChainsaw = new ItemVanillaChainsaw(bronzeMaterial, 650, "chainsaw_bronze", OreDictionary.getOres("ingotBronze").get(0).getItem(), 4F).setUnlocalizedName(ModInformation.modid + ".chainsaw.bronze"); + //GameRegistry.registerItem(bronzeChainsaw, "bronzeChainsaw"); - 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, "omnitool_gold", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.gold"); - GameRegistry.registerItem(goldenOmnitool, "goldenOmnitool"); - 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"); + //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, "omnitool_gold", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".omnitool.gold"); + //GameRegistry.registerItem(goldenOmnitool, "goldenOmnitool"); + //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/modules/base/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java index b1648b4..ed2691b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java @@ -34,7 +34,6 @@ public class ItemChristmasFocus extends ItemBaseFocus { public ItemChristmasFocus() { super("base.focus.christmas", "focus_christmas" ); - setCreativeTab(ElectroMagicTools.tabEMT); } @Override diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index a1fcd98..f0cfef1 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -60,7 +60,7 @@ item.EMT.emtitems.uumatterDrop.name=Кристаллизированная ка item.EMT.emtbauble.euMaker.armor.name=Кольцо для зарядки брони item.EMT.emtbauble.euMaker.inventory.name=Кольцо для зарядки инвентаря -item.EMT.emtbauble.oneRing.name=Кольцо Всевластия +item.EMT.module.base.bauble.oneRing.name=Кольцо Всевластия item.EMT.goggles.electric.name=Электрические очки откровения item.EMT.goggles.nano.name=Нано-очки откровения @@ -101,33 +101,33 @@ item.EMT.module.base.focus.shield.name=Набалдашник: Щит item.EMT.module.ic2.focus.charge.name=Набалдашник: Зарядка item.EMT.module.ic2.focus.charge.wand.name=Набалдашник: Зарядка жезла -item.EMT.drill.wood.name=Деревянный бур -item.EMT.drill.stone.name=Каменный бур -item.EMT.drill.iron.name=Железный бур -item.EMT.drill.gold.name=Золотой бур -item.EMT.drill.diamond.name=Алмазный бур -item.EMT.drill.copper.name=Медный бур -item.EMT.drill.tin.name=Оловянный бур -item.EMT.drill.lead.name=Свинцовый бур -item.EMT.drill.bronze.name=Бронзовый бур +item.EMT.drill.wood.name +item.EMT.drill.stone.name +item.EMT.drill.iron.name +item.EMT.drill.gold.name +item.EMT.drill.diamond.name +item.EMT.drill.copper.name +item.EMT.drill.tin.name +item.EMT.drill.lead.name +item.EMT.drill.bronze.name -item.EMT.chainsaw.wood.name=Деревянная электропила -item.EMT.chainsaw.stone.name=Каменная электропила -item.EMT.chainsaw.iron.name=Железная электропила -item.EMT.chainsaw.gold.name=Золотая электропила -item.EMT.chainsaw.diamond.name=Алмазная электропила -item.EMT.chainsaw.copper.name=Медная электропила -item.EMT.chainsaw.tin.name=Оловянная электропила -item.EMT.chainsaw.lead.name=Свинцовая электропила -item.EMT.chainsaw.bronze.name=Бронзовая электропила +item.EMT.chainsaw.wood.name +item.EMT.chainsaw.stone.name +item.EMT.chainsaw.iron.name +item.EMT.chainsaw.gold.name +item.EMT.chainsaw.diamond.name +item.EMT.chainsaw.copper.name +item.EMT.chainsaw.tin.name +item.EMT.chainsaw.lead.name +item.EMT.chainsaw.bronze.name -item.EMT.omnitool.iron.name=Железный мультиинструмент -item.EMT.omnitool.gold.name=Золотой мультиинструмент -item.EMT.omnitool.diamond.name=Алмазный мультиинструмент -item.EMT.omnitool.copper.name=Медный мультиинструмент -item.EMT.omnitool.tin.name=Оловянный мультиинструмент -item.EMT.omnitool.lead.name=Свинцовый мультиинструмент -item.EMT.omnitool.bronze.name=Бронзовый мультиинструмент +item.EMT.omnitool.iron.name +item.EMT.omnitool.gold.name +item.EMT.omnitool.diamond.name +item.EMT.omnitool.copper.name +item.EMT.omnitool.tin.name +item.EMT.omnitool.lead.name +item.EMT.omnitool.bronze.name item.EMT.module.base.components.drillTop.wood.name=Wooden Drill Top item.EMT.module.base.components.drillTop.stone.name=Stone Drill Top @@ -157,15 +157,15 @@ item.EMT.module.base.components.omnitoolTop.tin.name=Tin Omnitool Top item.EMT.module.base.components.omnitoolTop.lead.name=Lead Omnitool Top item.EMT.module.base.components.omnitoolTop.bronze.name=Bronze Omnitool Top -item.EMT.module.base.components.shard.wood.name=Деревянный осколок -item.EMT.module.base.components.shard.stone.name=Каменный осколок -item.EMT.module.base.components.shard.iron.name=Железный осколок -item.EMT.module.base.components.shard.gold.name=Золотой осколок -item.EMT.module.base.components.shard.obsidian.name=Обсидиановый осколок -item.EMT.module.base.components.shard.copper.name=Медный осколок -item.EMT.module.base.components.shard.tin.name=Оловянный осколок -item.EMT.module.base.components.shard.lead.name=Свинцовый осколок -item.EMT.module.base.components.shard.bronze.name=Бронзовый осколок +item.EMT.module.base.components.shard.wood.name +item.EMT.module.base.components.shard.stone.name +item.EMT.module.base.components.shard.iron.name +item.EMT.module.base.components.shard.gold.name +item.EMT.module.base.components.shard.obsidian.name +item.EMT.module.base.components.shard.copper.name +item.EMT.module.base.components.shard.tin.name +item.EMT.module.base.components.shard.lead.name +item.EMT.module.base.components.shard.bronze.name item.EMT.carver.wood.name=Деревянный резчик по осколкам item.EMT.carver.stone.name=Каменный резчик по осколкам