From c10a91da29adec175c1cb7727584444f4bc86a7b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 31 Dec 2015 15:05:27 +0100 Subject: [PATCH] SO MANY NEW ITEMS ITS ALL TOOLS AND ARMOR OMG --- .../config/values/ConfigCrafting.java | 1 + .../crafting/ToolCrafting.java | 210 ++++++------------ .../creative/CreativeTab.java | 70 +++++- .../actuallyadditions/items/InitItems.java | 193 +++++++++++++--- .../items/base/ItemAllToolAA.java | 24 +- .../items/base/ItemArmorAA.java | 17 +- .../items/base/ItemAxeAA.java | 16 +- .../items/base/ItemHoeAA.java | 16 +- .../items/base/ItemPickaxeAA.java | 16 +- .../items/base/ItemShovelAA.java | 16 +- .../items/base/ItemSwordAA.java | 16 +- .../material/InitArmorMaterials.java | 28 ++- .../material/InitToolMaterials.java | 14 ++ .../actuallyadditions/ore/InitOreDict.java | 6 +- .../assets/actuallyadditions/lang/en_US.lang | 54 +++++ 15 files changed, 423 insertions(+), 274 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 05afd66f7..340808f2b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -81,6 +81,7 @@ public enum ConfigCrafting{ TOOL_EMERALD("Emerald Tools", ConfigCategories.ITEMS_CRAFTING), TOOL_OBSIDIAN("Obsidian Tools", ConfigCategories.ITEMS_CRAFTING), TOOL_QUARTZ("Obsidian Tools", ConfigCategories.ITEMS_CRAFTING), + TOOL_CRYSTALS("Crystal Tools", ConfigCategories.ITEMS_CRAFTING), RICE_BREAD("Rice Bread", ConfigCategories.FOOD_CRAFTING), RICE_DOUGH("Rice Dough", ConfigCategories.FOOD_CRAFTING), diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java index c8ac876ee..17527ace4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java @@ -13,10 +13,12 @@ package de.ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; import de.ellpeck.actuallyadditions.config.values.ConfigCrafting; import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -31,159 +33,24 @@ public class ToolCrafting{ public static void init(){ if(ConfigCrafting.TOOL_EMERALD.isEnabled()){ - //Pickaxe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemPickaxeEmerald), - "EEE", " S ", " S ", - 'E', "gemEmerald", - 'S', new ItemStack(Items.stick))); - - //Sword - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemSwordEmerald), - "E", "E", "S", - 'E', "gemEmerald", - 'S', new ItemStack(Items.stick))); - - //Axe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemAxeEmerald), - "EE", "ES", " S", - 'E', "gemEmerald", - 'S', new ItemStack(Items.stick))); - - //Shovel - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemShovelEmerald), - "E", "S", "S", - 'E', "gemEmerald", - 'S', new ItemStack(Items.stick))); - - //Hoe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemHoeEmerald), - "EE", " S", " S", - 'E', "gemEmerald", - 'S', new ItemStack(Items.stick))); - - //Helm - GameRegistry.addRecipe(new ItemStack(InitItems.itemHelmEmerald), - "OOO", "O O", - 'O', new ItemStack(Items.emerald)); - - //Chest - GameRegistry.addRecipe(new ItemStack(InitItems.itemChestEmerald), - "O O", "OOO", "OOO", - 'O', new ItemStack(Items.emerald)); - - //Legs - GameRegistry.addRecipe(new ItemStack(InitItems.itemPantsEmerald), - "OOO", "O O", "O O", - 'O', new ItemStack(Items.emerald)); - - //Boots - GameRegistry.addRecipe(new ItemStack(InitItems.itemBootsEmerald), - "O O", "O O", - 'O', new ItemStack(Items.emerald)); + addToolAndArmorRecipes(new ItemStack(Items.emerald), InitItems.itemPickaxeEmerald, InitItems.itemSwordEmerald, InitItems.itemAxeEmerald, InitItems.itemShovelEmerald, InitItems.itemHoeEmerald, InitItems.itemHelmEmerald, InitItems.itemChestEmerald, InitItems.itemPantsEmerald, InitItems.itemBootsEmerald); } if(ConfigCrafting.TOOL_QUARTZ.isEnabled()){ - //Pickaxe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemPickaxeQuartz), - "EEE", " S ", " S ", - 'E', "gemQuartzBlack", - 'S', new ItemStack(Items.stick))); - - //Sword - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemSwordQuartz), - "E", "E", "S", - 'E', "gemQuartzBlack", - 'S', new ItemStack(Items.stick))); - - //Axe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemAxeQuartz), - "EE", "ES", " S", - 'E', "gemQuartzBlack", - 'S', new ItemStack(Items.stick))); - - //Shovel - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemShovelQuartz), - "E", "S", "S", - 'E', "gemQuartzBlack", - 'S', new ItemStack(Items.stick))); - - //Hoe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemHoeQuartz), - "EE", " S", " S", - 'E', "gemQuartzBlack", - 'S', new ItemStack(Items.stick))); - - //Helm - GameRegistry.addRecipe(new ItemStack(InitItems.itemHelmQuartz), - "OOO", "O O", - 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); - - //Chest - GameRegistry.addRecipe(new ItemStack(InitItems.itemChestQuartz), - "O O", "OOO", "OOO", - 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); - - //Legs - GameRegistry.addRecipe(new ItemStack(InitItems.itemPantsQuartz), - "OOO", "O O", "O O", - 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); - - //Boots - GameRegistry.addRecipe(new ItemStack(InitItems.itemBootsQuartz), - "O O", "O O", - 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())); + addToolAndArmorRecipes(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), InitItems.itemPickaxeQuartz, InitItems.itemSwordQuartz, InitItems.itemAxeQuartz, InitItems.itemShovelQuartz, InitItems.itemHoeQuartz, InitItems.itemHelmQuartz, InitItems.itemChestQuartz, InitItems.itemPantsQuartz, InitItems.itemBootsQuartz); } if(ConfigCrafting.TOOL_OBSIDIAN.isEnabled()){ - //Pickaxe - GameRegistry.addRecipe(new ItemStack(InitItems.itemPickaxeObsidian), - "EEE", " S ", " S ", - 'E', new ItemStack(Blocks.obsidian), - 'S', new ItemStack(Items.stick)); + addToolAndArmorRecipes(new ItemStack(Blocks.obsidian), InitItems.itemPickaxeObsidian, InitItems.itemSwordObsidian, InitItems.itemAxeObsidian, InitItems.itemShovelObsidian, InitItems.itemHoeObsidian, InitItems.itemHelmObsidian, InitItems.itemChestObsidian, InitItems.itemPantsObsidian, InitItems.itemBootsObsidian); + } - //Sword - GameRegistry.addRecipe(new ItemStack(InitItems.itemSwordObsidian), - "E", "E", "S", - 'E', new ItemStack(Blocks.obsidian), - 'S', new ItemStack(Items.stick)); - - //Axe - GameRegistry.addRecipe(new ItemStack(InitItems.itemAxeObsidian), - "EE", "ES", " S", - 'E', new ItemStack(Blocks.obsidian), - 'S', new ItemStack(Items.stick)); - - //Shovel - GameRegistry.addRecipe(new ItemStack(InitItems.itemShovelObsidian), - "E", "S", "S", - 'E', new ItemStack(Blocks.obsidian), - 'S', new ItemStack(Items.stick)); - - //Hoe - GameRegistry.addRecipe(new ItemStack(InitItems.itemHoeObsidian), - "EE", " S", " S", - 'E', new ItemStack(Blocks.obsidian), - 'S', new ItemStack(Items.stick)); - - //Helm - GameRegistry.addRecipe(new ItemStack(InitItems.itemHelmObsidian), - "OOO", "O O", - 'O', new ItemStack(Blocks.obsidian)); - - //Chest - GameRegistry.addRecipe(new ItemStack(InitItems.itemChestObsidian), - "O O", "OOO", "OOO", - 'O', new ItemStack(Blocks.obsidian)); - - //Legs - GameRegistry.addRecipe(new ItemStack(InitItems.itemPantsObsidian), - "OOO", "O O", "O O", - 'O', new ItemStack(Blocks.obsidian)); - - //Boots - GameRegistry.addRecipe(new ItemStack(InitItems.itemBootsObsidian), - "O O", "O O", - 'O', new ItemStack(Blocks.obsidian)); + if(ConfigCrafting.TOOL_CRYSTALS.isEnabled()){ + addToolAndArmorRecipes(new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), InitItems.itemPickaxeCrystalRed, InitItems.itemSwordCrystalRed, InitItems.itemAxeCrystalRed, InitItems.itemShovelCrystalRed, InitItems.itemHoeCrystalRed, InitItems.itemHelmCrystalRed, InitItems.itemChestCrystalRed, InitItems.itemPantsCrystalRed, InitItems.itemBootsCrystalRed); + addToolAndArmorRecipes(new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), InitItems.itemPickaxeCrystalGreen, InitItems.itemSwordCrystalGreen, InitItems.itemAxeCrystalGreen, InitItems.itemShovelCrystalGreen, InitItems.itemHoeCrystalGreen, InitItems.itemHelmCrystalGreen, InitItems.itemChestCrystalGreen, InitItems.itemPantsCrystalGreen, InitItems.itemBootsCrystalGreen); + addToolAndArmorRecipes(new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), InitItems.itemPickaxeCrystalWhite, InitItems.itemSwordCrystalWhite, InitItems.itemAxeCrystalWhite, InitItems.itemShovelCrystalWhite, InitItems.itemHoeCrystalWhite, InitItems.itemHelmCrystalWhite, InitItems.itemChestCrystalWhite, InitItems.itemPantsCrystalWhite, InitItems.itemBootsCrystalWhite); + addToolAndArmorRecipes(new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), InitItems.itemPickaxeCrystalLightBlue, InitItems.itemSwordCrystalLightBlue, InitItems.itemAxeCrystalLightBlue, InitItems.itemShovelCrystalLightBlue, InitItems.itemHoeCrystalLightBlue, InitItems.itemHelmCrystalLightBlue, InitItems.itemChestCrystalLightBlue, InitItems.itemPantsCrystalLightBlue, InitItems.itemBootsCrystalLightBlue); + addToolAndArmorRecipes(new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), InitItems.itemPickaxeCrystalBlue, InitItems.itemSwordCrystalBlue, InitItems.itemAxeCrystalBlue, InitItems.itemShovelCrystalBlue, InitItems.itemHoeCrystalBlue, InitItems.itemHelmCrystalBlue, InitItems.itemChestCrystalBlue, InitItems.itemPantsCrystalBlue, InitItems.itemBootsCrystalBlue); + addToolAndArmorRecipes(new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), InitItems.itemPickaxeCrystalBlack, InitItems.itemSwordCrystalBlack, InitItems.itemAxeCrystalBlack, InitItems.itemShovelCrystalBlack, InitItems.itemHoeCrystalBlack, InitItems.itemHelmCrystalBlack, InitItems.itemChestCrystalBlack, InitItems.itemPantsCrystalBlack, InitItems.itemBootsCrystalBlack); } //Paxels @@ -247,4 +114,55 @@ public class ToolCrafting{ } } + public static void addToolAndArmorRecipes(ItemStack base, Item pickaxe, Item sword, Item axe, Item shovel, Item hoe, Item helm, Item chest, Item pants, Item boots){ + //Pickaxe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(pickaxe), + "EEE", " S ", " S ", + 'E', base, + 'S', new ItemStack(Items.stick))); + + //Sword + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(sword), + "E", "E", "S", + 'E', base, + 'S', new ItemStack(Items.stick))); + + //Axe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(axe), + "EE", "ES", " S", + 'E', base, + 'S', new ItemStack(Items.stick))); + + //Shovel + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(shovel), + "E", "S", "S", + 'E', base, + 'S', new ItemStack(Items.stick))); + + //Hoe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(hoe), + "EE", " S", " S", + 'E', base, + 'S', new ItemStack(Items.stick))); + + //Helm + GameRegistry.addRecipe(new ItemStack(helm), + "OOO", "O O", + 'O', base); + + //Chest + GameRegistry.addRecipe(new ItemStack(chest), + "O O", "OOO", "OOO", + 'O', base); + + //Legs + GameRegistry.addRecipe(new ItemStack(pants), + "OOO", "O O", "O O", + 'O', base); + + //Boots + GameRegistry.addRecipe(new ItemStack(boots), + "O O", "O O", + 'O', base); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java index eba274dfb..78dae2105 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -185,6 +185,14 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.obsidianPaxel); add(InitItems.quartzPaxel); InitForeignPaxels.addToCreativeTab(); + + add(InitBlocks.blockCrystal); + add(InitItems.itemCrystal); + + add(InitItems.itemJams); + + add(InitItems.itemPotionRing); + add(InitItems.itemPotionRingAdvanced); add(InitItems.itemPickaxeQuartz); add(InitItems.itemSwordQuartz); @@ -219,13 +227,65 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.itemPantsObsidian); add(InitItems.itemBootsObsidian); - add(InitBlocks.blockCrystal); - add(InitItems.itemCrystal); + add(InitItems.itemPickaxeCrystalRed); + add(InitItems.itemAxeCrystalRed); + add(InitItems.itemShovelCrystalRed); + add(InitItems.itemSwordCrystalRed); + add(InitItems.itemHoeCrystalRed); + add(InitItems.itemHelmCrystalRed); + add(InitItems.itemChestCrystalRed); + add(InitItems.itemPantsCrystalRed); + add(InitItems.itemBootsCrystalRed); - add(InitItems.itemJams); + add(InitItems.itemPickaxeCrystalBlue); + add(InitItems.itemAxeCrystalBlue); + add(InitItems.itemShovelCrystalBlue); + add(InitItems.itemSwordCrystalBlue); + add(InitItems.itemHoeCrystalBlue); + add(InitItems.itemHelmCrystalBlue); + add(InitItems.itemChestCrystalBlue); + add(InitItems.itemPantsCrystalBlue); + add(InitItems.itemBootsCrystalBlue); - add(InitItems.itemPotionRing); - add(InitItems.itemPotionRingAdvanced); + add(InitItems.itemPickaxeCrystalLightBlue); + add(InitItems.itemAxeCrystalLightBlue); + add(InitItems.itemShovelCrystalLightBlue); + add(InitItems.itemSwordCrystalLightBlue); + add(InitItems.itemHoeCrystalLightBlue); + add(InitItems.itemHelmCrystalLightBlue); + add(InitItems.itemChestCrystalLightBlue); + add(InitItems.itemPantsCrystalLightBlue); + add(InitItems.itemBootsCrystalLightBlue); + + add(InitItems.itemPickaxeCrystalBlack); + add(InitItems.itemAxeCrystalBlack); + add(InitItems.itemShovelCrystalBlack); + add(InitItems.itemSwordCrystalBlack); + add(InitItems.itemHoeCrystalBlack); + add(InitItems.itemHelmCrystalBlack); + add(InitItems.itemChestCrystalBlack); + add(InitItems.itemPantsCrystalBlack); + add(InitItems.itemBootsCrystalBlack); + + add(InitItems.itemPickaxeCrystalGreen); + add(InitItems.itemAxeCrystalGreen); + add(InitItems.itemShovelCrystalGreen); + add(InitItems.itemSwordCrystalGreen); + add(InitItems.itemHoeCrystalGreen); + add(InitItems.itemHelmCrystalGreen); + add(InitItems.itemChestCrystalGreen); + add(InitItems.itemPantsCrystalGreen); + add(InitItems.itemBootsCrystalGreen); + + add(InitItems.itemPickaxeCrystalWhite); + add(InitItems.itemAxeCrystalWhite); + add(InitItems.itemShovelCrystalWhite); + add(InitItems.itemSwordCrystalWhite); + add(InitItems.itemHoeCrystalWhite); + add(InitItems.itemHelmCrystalWhite); + add(InitItems.itemChestCrystalWhite); + add(InitItems.itemPantsCrystalWhite); + add(InitItems.itemBootsCrystalWhite); } public void add(Item item){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java index 772816302..f940c8941 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java @@ -14,12 +14,14 @@ import de.ellpeck.actuallyadditions.blocks.InitBlocks; import de.ellpeck.actuallyadditions.items.base.*; import de.ellpeck.actuallyadditions.items.lens.ItemLens; import de.ellpeck.actuallyadditions.items.lens.Lenses; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.material.InitArmorMaterials; import de.ellpeck.actuallyadditions.material.InitToolMaterials; import de.ellpeck.actuallyadditions.util.CompatUtil; import de.ellpeck.actuallyadditions.util.ModUtil; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -135,9 +137,70 @@ public class InitItems{ public static Item itemExplosionLens; public static Item itemDamageLens; + public static Item itemPickaxeCrystalRed; + public static Item itemAxeCrystalRed; + public static Item itemShovelCrystalRed; + public static Item itemSwordCrystalRed; + public static Item itemHoeCrystalRed; + public static Item itemHelmCrystalRed; + public static Item itemChestCrystalRed; + public static Item itemPantsCrystalRed; + public static Item itemBootsCrystalRed; + + public static Item itemPickaxeCrystalBlue; + public static Item itemAxeCrystalBlue; + public static Item itemShovelCrystalBlue; + public static Item itemSwordCrystalBlue; + public static Item itemHoeCrystalBlue; + public static Item itemHelmCrystalBlue; + public static Item itemChestCrystalBlue; + public static Item itemPantsCrystalBlue; + public static Item itemBootsCrystalBlue; + + public static Item itemPickaxeCrystalLightBlue; + public static Item itemAxeCrystalLightBlue; + public static Item itemShovelCrystalLightBlue; + public static Item itemSwordCrystalLightBlue; + public static Item itemHoeCrystalLightBlue; + public static Item itemHelmCrystalLightBlue; + public static Item itemChestCrystalLightBlue; + public static Item itemPantsCrystalLightBlue; + public static Item itemBootsCrystalLightBlue; + + public static Item itemPickaxeCrystalBlack; + public static Item itemAxeCrystalBlack; + public static Item itemShovelCrystalBlack; + public static Item itemSwordCrystalBlack; + public static Item itemHoeCrystalBlack; + public static Item itemHelmCrystalBlack; + public static Item itemChestCrystalBlack; + public static Item itemPantsCrystalBlack; + public static Item itemBootsCrystalBlack; + + public static Item itemPickaxeCrystalGreen; + public static Item itemAxeCrystalGreen; + public static Item itemShovelCrystalGreen; + public static Item itemSwordCrystalGreen; + public static Item itemHoeCrystalGreen; + public static Item itemHelmCrystalGreen; + public static Item itemChestCrystalGreen; + public static Item itemPantsCrystalGreen; + public static Item itemBootsCrystalGreen; + + public static Item itemPickaxeCrystalWhite; + public static Item itemAxeCrystalWhite; + public static Item itemShovelCrystalWhite; + public static Item itemSwordCrystalWhite; + public static Item itemHoeCrystalWhite; + public static Item itemHelmCrystalWhite; + public static Item itemChestCrystalWhite; + public static Item itemPantsCrystalWhite; + public static Item itemBootsCrystalWhite; + public static void init(){ ModUtil.LOGGER.info("Initializing Items..."); + itemMisc = new ItemMisc("itemMisc"); itemCrateKeeper = new ItemGeneric("itemCrateKeeper"); itemColorLens = new ItemLens("itemColorLens", Lenses.LENS_COLOR); itemExplosionLens = new ItemLens("itemExplosionLens", Lenses.LENS_DETONATION); @@ -149,18 +212,18 @@ public class InitItems{ itemGrowthRing = new ItemGrowthRing("itemGrowthRing"); itemMagnetRing = new ItemMagnetRing("itemSuctionRing"); itemWaterRemovalRing = new ItemWaterRemovalRing("itemWaterRemovalRing"); - itemHelmEmerald = new ItemArmorAA("itemHelmEmerald", InitArmorMaterials.armorMaterialEmerald, 0, "gemEmerald", "armorEmerald"); - itemChestEmerald = new ItemArmorAA("itemChestEmerald", InitArmorMaterials.armorMaterialEmerald, 1, "gemEmerald", "armorEmerald"); - itemPantsEmerald = new ItemArmorAA("itemPantsEmerald", InitArmorMaterials.armorMaterialEmerald, 2, "gemEmerald", "armorEmerald"); - itemBootsEmerald = new ItemArmorAA("itemBootsEmerald", InitArmorMaterials.armorMaterialEmerald, 3, "gemEmerald", "armorEmerald"); - itemHelmObsidian = new ItemArmorAA("itemHelmObsidian", InitArmorMaterials.armorMaterialObsidian, 0, "obsidian", "armorObsidian"); - itemChestObsidian = new ItemArmorAA("itemChestObsidian", InitArmorMaterials.armorMaterialObsidian, 1, "obsidian", "armorObsidian"); - itemPantsObsidian = new ItemArmorAA("itemPantsObsidian", InitArmorMaterials.armorMaterialObsidian, 2, "obsidian", "armorObsidian"); - itemBootsObsidian = new ItemArmorAA("itemBootsObsidian", InitArmorMaterials.armorMaterialObsidian, 3, "obsidian", "armorObsidian"); - itemHelmQuartz = new ItemArmorAA("itemHelmQuartz", InitArmorMaterials.armorMaterialQuartz, 0, "gemQuartzBlack", "armorQuartz"); - itemChestQuartz = new ItemArmorAA("itemChestQuartz", InitArmorMaterials.armorMaterialQuartz, 1, "gemQuartzBlack", "armorQuartz"); - itemPantsQuartz = new ItemArmorAA("itemPantsQuartz", InitArmorMaterials.armorMaterialQuartz, 2, "gemQuartzBlack", "armorQuartz"); - itemBootsQuartz = new ItemArmorAA("itemBootsQuartz", InitArmorMaterials.armorMaterialQuartz, 3, "gemQuartzBlack", "armorQuartz"); + itemHelmEmerald = new ItemArmorAA("itemHelmEmerald", InitArmorMaterials.armorMaterialEmerald, 0, new ItemStack(Items.emerald), "armorEmerald"); + itemChestEmerald = new ItemArmorAA("itemChestEmerald", InitArmorMaterials.armorMaterialEmerald, 1, new ItemStack(Items.emerald), "armorEmerald"); + itemPantsEmerald = new ItemArmorAA("itemPantsEmerald", InitArmorMaterials.armorMaterialEmerald, 2, new ItemStack(Items.emerald), "armorEmerald"); + itemBootsEmerald = new ItemArmorAA("itemBootsEmerald", InitArmorMaterials.armorMaterialEmerald, 3, new ItemStack(Items.emerald), "armorEmerald"); + itemHelmObsidian = new ItemArmorAA("itemHelmObsidian", InitArmorMaterials.armorMaterialObsidian, 0, new ItemStack(Blocks.obsidian), "armorObsidian"); + itemChestObsidian = new ItemArmorAA("itemChestObsidian", InitArmorMaterials.armorMaterialObsidian, 1, new ItemStack(Blocks.obsidian), "armorObsidian"); + itemPantsObsidian = new ItemArmorAA("itemPantsObsidian", InitArmorMaterials.armorMaterialObsidian, 2, new ItemStack(Blocks.obsidian), "armorObsidian"); + itemBootsObsidian = new ItemArmorAA("itemBootsObsidian", InitArmorMaterials.armorMaterialObsidian, 3, new ItemStack(Blocks.obsidian), "armorObsidian"); + itemHelmQuartz = new ItemArmorAA("itemHelmQuartz", InitArmorMaterials.armorMaterialQuartz, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "armorQuartz"); + itemChestQuartz = new ItemArmorAA("itemChestQuartz", InitArmorMaterials.armorMaterialQuartz, 1, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "armorQuartz"); + itemPantsQuartz = new ItemArmorAA("itemPantsQuartz", InitArmorMaterials.armorMaterialQuartz, 2, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "armorQuartz"); + itemBootsQuartz = new ItemArmorAA("itemBootsQuartz", InitArmorMaterials.armorMaterialQuartz, 3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "armorQuartz"); itemTeleStaff = new ItemTeleStaff("itemTeleStaff"); itemWingsOfTheBats = new ItemWingsOfTheBats("itemWingsOfTheBats"); itemDrill = new ItemDrill("itemDrill"); @@ -186,7 +249,6 @@ public class InitItems{ itemCoffee = new ItemCoffee("itemCoffee"); itemPhantomConnector = new ItemPhantomConnector("itemPhantomConnector"); itemResonantRice = new ItemResonantRice("itemResonantRice"); - itemMisc = new ItemMisc("itemMisc"); itemFoods = new ItemFoods("itemFood"); itemJams = new ItemJams("itemJam"); itemKnife = new ItemKnife("itemKnife"); @@ -207,28 +269,89 @@ public class InitItems{ CompatUtil.registerMFRSeed(itemFlaxSeed); itemCoffeeSeed = new ItemSeed("itemCoffeeSeed", "seedCoffeeBeans", InitBlocks.blockCoffee, itemCoffeeBean, 0); CompatUtil.registerMFRSeed(itemCoffeeSeed); - itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "itemPickaxeEmerald", EnumRarity.epic); - itemAxeEmerald = new ItemAxeAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "itemAxeEmerald", EnumRarity.epic); - itemShovelEmerald = new ItemShovelAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "itemShovelEmerald", EnumRarity.epic); - itemSwordEmerald = new ItemSwordAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "itemSwordEmerald", EnumRarity.epic); - itemHoeEmerald = new ItemHoeAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "itemHoeEmerald", EnumRarity.epic); - itemPickaxeObsidian = new ItemPickaxeAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "itemPickaxeObsidian", EnumRarity.uncommon); - itemAxeObsidian = new ItemAxeAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "itemAxeObsidian", EnumRarity.uncommon); - itemShovelObsidian = new ItemShovelAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "itemShovelObsidian", EnumRarity.uncommon); - itemSwordObsidian = new ItemSwordAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "itemSwordObsidian", EnumRarity.uncommon); - itemHoeObsidian = new ItemHoeAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "itemHoeObsidian", EnumRarity.uncommon); - itemPickaxeQuartz = new ItemPickaxeAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "itemPickaxeQuartz", EnumRarity.rare); - itemAxeQuartz = new ItemAxeAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "itemAxeQuartz", EnumRarity.rare); - itemShovelQuartz = new ItemShovelAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "itemShovelQuartz", EnumRarity.rare); - itemSwordQuartz = new ItemSwordAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "itemSwordQuartz", EnumRarity.rare); - itemHoeQuartz = new ItemHoeAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "itemHoeQuartz", EnumRarity.rare); + itemPickaxeEmerald = new ItemPickaxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.emerald), "itemPickaxeEmerald", EnumRarity.epic); + itemAxeEmerald = new ItemAxeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.emerald), "itemAxeEmerald", EnumRarity.epic); + itemShovelEmerald = new ItemShovelAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.emerald), "itemShovelEmerald", EnumRarity.epic); + itemSwordEmerald = new ItemSwordAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.emerald), "itemSwordEmerald", EnumRarity.epic); + itemHoeEmerald = new ItemHoeAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.emerald), "itemHoeEmerald", EnumRarity.epic); + itemPickaxeObsidian = new ItemPickaxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.obsidian), "itemPickaxeObsidian", EnumRarity.uncommon); + itemAxeObsidian = new ItemAxeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.obsidian), "itemAxeObsidian", EnumRarity.uncommon); + itemShovelObsidian = new ItemShovelAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.obsidian), "itemShovelObsidian", EnumRarity.uncommon); + itemSwordObsidian = new ItemSwordAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.obsidian), "itemSwordObsidian", EnumRarity.uncommon); + itemHoeObsidian = new ItemHoeAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.obsidian), "itemHoeObsidian", EnumRarity.uncommon); + itemPickaxeQuartz = new ItemPickaxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemPickaxeQuartz", EnumRarity.rare); + itemAxeQuartz = new ItemAxeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemAxeQuartz", EnumRarity.rare); + itemShovelQuartz = new ItemShovelAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemShovelQuartz", EnumRarity.rare); + itemSwordQuartz = new ItemSwordAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemSwordQuartz", EnumRarity.rare); + itemHoeQuartz = new ItemHoeAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "itemHoeQuartz", EnumRarity.rare); woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plankWood", "woodenPaxel", EnumRarity.uncommon, 5192733); - stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, "stone", "stonePaxel", EnumRarity.uncommon, 7040621); - ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, "ingotIron", "ironPaxel", EnumRarity.rare, 10920613); - goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, "ingotGold", "goldPaxel", EnumRarity.rare, 16770048); - diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.EMERALD, "gemDiamond", "diamondPaxel", EnumRarity.epic, 3250376); - emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "emeraldPaxel", EnumRarity.epic, 7723338); - obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "obsidianPaxel", EnumRarity.epic, 4166); - quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "quartzPaxel", EnumRarity.rare, 1710103); + stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, new ItemStack(Blocks.cobblestone), "stonePaxel", EnumRarity.uncommon, 7040621); + ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, new ItemStack(Items.iron_ingot), "ironPaxel", EnumRarity.rare, 10920613); + goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, new ItemStack(Items.gold_ingot), "goldPaxel", EnumRarity.rare, 16770048); + diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.EMERALD, new ItemStack(Items.diamond), "diamondPaxel", EnumRarity.epic, 3250376); + emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, new ItemStack(Items.emerald), "emeraldPaxel", EnumRarity.epic, 7723338); + obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, new ItemStack(Blocks.obsidian), "obsidianPaxel", EnumRarity.epic, 4166); + quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), "quartzPaxel", EnumRarity.rare, 1710103); + + itemPickaxeCrystalRed = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemPickaxeCrystalRed", EnumRarity.uncommon); + itemAxeCrystalRed = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemAxeCrystalRed", EnumRarity.uncommon); + itemShovelCrystalRed = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemShovelCrystalRed", EnumRarity.uncommon); + itemSwordCrystalRed = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemSwordCrystalRed", EnumRarity.uncommon); + itemHoeCrystalRed = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemHoeCrystalRed", EnumRarity.uncommon); + itemHelmCrystalRed = new ItemArmorAA("itemHelmCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "armorCrystalRed"); + itemChestCrystalRed = new ItemArmorAA("itemChestCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "armorCrystalRed"); + itemPantsCrystalRed = new ItemArmorAA("itemPantsCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "armorCrystalRed"); + itemBootsCrystalRed = new ItemArmorAA("itemBootsCrystalRed", InitArmorMaterials.armorMaterialCrystalRed, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "armorCrystalRed"); + + itemPickaxeCrystalBlue = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemPickaxeCrystalBlue", EnumRarity.uncommon); + itemAxeCrystalBlue = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemAxeCrystalBlue", EnumRarity.uncommon); + itemShovelCrystalBlue = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemShovelCrystalBlue", EnumRarity.uncommon); + itemSwordCrystalBlue = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemSwordCrystalBlue", EnumRarity.uncommon); + itemHoeCrystalBlue = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemHoeCrystalBlue", EnumRarity.uncommon); + itemHelmCrystalBlue = new ItemArmorAA("itemHelmCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "armorCrystalBlue"); + itemChestCrystalBlue = new ItemArmorAA("itemChestCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "armorCrystalBlue"); + itemPantsCrystalBlue = new ItemArmorAA("itemPantsCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "armorCrystalBlue"); + itemBootsCrystalBlue = new ItemArmorAA("itemBootsCrystalBlue", InitArmorMaterials.armorMaterialCrystalBlue, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "armorCrystalBlue"); + + itemPickaxeCrystalLightBlue = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemPickaxeCrystalLightBlue", EnumRarity.uncommon); + itemAxeCrystalLightBlue = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemAxeCrystalLightBlue", EnumRarity.uncommon); + itemShovelCrystalLightBlue = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemShovelCrystalLightBlue", EnumRarity.uncommon); + itemSwordCrystalLightBlue = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemSwordCrystalLightBlue", EnumRarity.uncommon); + itemHoeCrystalLightBlue = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemHoeCrystalLightBlue", EnumRarity.uncommon); + itemHelmCrystalLightBlue = new ItemArmorAA("itemHelmCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "armorCrystalLightBlue"); + itemChestCrystalLightBlue = new ItemArmorAA("itemChestCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "armorCrystalLightBlue"); + itemPantsCrystalLightBlue = new ItemArmorAA("itemPantsCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "armorCrystalLightBlue"); + itemBootsCrystalLightBlue = new ItemArmorAA("itemBootsCrystalLightBlue", InitArmorMaterials.armorMaterialCrystalLightBlue, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "armorCrystalLightBlue"); + + itemPickaxeCrystalBlack = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemPickaxeCrystalBlack", EnumRarity.uncommon); + itemAxeCrystalBlack = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemAxeCrystalBlack", EnumRarity.uncommon); + itemShovelCrystalBlack = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemShovelCrystalBlack", EnumRarity.uncommon); + itemSwordCrystalBlack = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemSwordCrystalBlack", EnumRarity.uncommon); + itemHoeCrystalBlack = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemHoeCrystalBlack", EnumRarity.uncommon); + itemHelmCrystalBlack = new ItemArmorAA("itemHelmCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "armorCrystalBlack"); + itemChestCrystalBlack = new ItemArmorAA("itemChestCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "armorCrystalBlack"); + itemPantsCrystalBlack = new ItemArmorAA("itemPantsCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "armorCrystalBlack"); + itemBootsCrystalBlack = new ItemArmorAA("itemBootsCrystalBlack", InitArmorMaterials.armorMaterialCrystalBlack, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "armorCrystalBlack"); + + itemPickaxeCrystalGreen = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemPickaxeCrystalGreen", EnumRarity.uncommon); + itemAxeCrystalGreen = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemAxeCrystalGreen", EnumRarity.uncommon); + itemShovelCrystalGreen = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemShovelCrystalGreen", EnumRarity.uncommon); + itemSwordCrystalGreen = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemSwordCrystalGreen", EnumRarity.uncommon); + itemHoeCrystalGreen = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemHoeCrystalGreen", EnumRarity.uncommon); + itemHelmCrystalGreen = new ItemArmorAA("itemHelmCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "armorCrystalGreen"); + itemChestCrystalGreen = new ItemArmorAA("itemChestCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "armorCrystalGreen"); + itemPantsCrystalGreen = new ItemArmorAA("itemPantsCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "armorCrystalGreen"); + itemBootsCrystalGreen = new ItemArmorAA("itemBootsCrystalGreen", InitArmorMaterials.armorMaterialCrystalGreen, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "armorCrystalGreen"); + + itemPickaxeCrystalWhite = new ItemPickaxeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemPickaxeCrystalWhite", EnumRarity.uncommon); + itemAxeCrystalWhite = new ItemAxeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemAxeCrystalWhite", EnumRarity.uncommon); + itemShovelCrystalWhite = new ItemShovelAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemShovelCrystalWhite", EnumRarity.uncommon); + itemSwordCrystalWhite = new ItemSwordAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemSwordCrystalWhite", EnumRarity.uncommon); + itemHoeCrystalWhite = new ItemHoeAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemHoeCrystalWhite", EnumRarity.uncommon); + itemHelmCrystalWhite = new ItemArmorAA("itemHelmCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 0, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "armorCrystalWhite"); + itemChestCrystalWhite = new ItemArmorAA("itemChestCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 1, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "armorCrystalWhite"); + itemPantsCrystalWhite = new ItemArmorAA("itemPantsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "armorCrystalWhite"); + itemBootsCrystalWhite = new ItemArmorAA("itemBootsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "armorCrystalWhite"); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java index ed035d470..ae3175e64 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAllToolAA.java @@ -17,6 +17,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.config.ConfigValues; import de.ellpeck.actuallyadditions.creative.CreativeTab; +import de.ellpeck.actuallyadditions.util.ItemUtil; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -44,9 +45,10 @@ public class ItemAllToolAA extends ItemTool{ private String name; private EnumRarity rarity; - private String repairItem; + private ItemStack repairItem; + private String repairOredict; - public ItemAllToolAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity, int color){ + public ItemAllToolAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity, int color){ super(4.0F, toolMat, Sets.newHashSet()); this.repairItem = repairItem; @@ -59,6 +61,11 @@ public class ItemAllToolAA extends ItemTool{ this.register(); } + public ItemAllToolAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity, int color){ + this(toolMat, (ItemStack)null, unlocalizedName, rarity, color); + this.repairOredict = repairItem; + } + private void register(){ this.setUnlocalizedName(ModUtil.MOD_ID_LOWER+"."+this.getBaseName()); GameRegistry.registerItem(this, this.getBaseName()); @@ -160,10 +167,15 @@ public class ItemAllToolAA extends ItemTool{ @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ - int[] idsStack = OreDictionary.getOreIDs(stack); - for(int id : idsStack){ - if(OreDictionary.getOreName(id).equals(repairItem)){ - return true; + if(this.repairItem != null){ + return ItemUtil.areItemsEqual(this.repairItem, stack, false); + } + else if(this.repairOredict != null){ + int[] idsStack = OreDictionary.getOreIDs(stack); + for(int id : idsStack){ + if(OreDictionary.getOreName(id).equals(this.repairOredict)){ + return true; + } } } return false; diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemArmorAA.java index 52727f07f..4a64044f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemArmorAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemArmorAA.java @@ -14,6 +14,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.creative.CreativeTab; +import de.ellpeck.actuallyadditions.util.ItemUtil; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -21,24 +22,20 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class ItemArmorAA extends ItemArmor{ - private String repairItem; + private ItemStack repairItem; private String name; private String[] textures; - public ItemArmorAA(String name, ArmorMaterial material, int type, String repairItem, String textureBase){ + public ItemArmorAA(String name, ArmorMaterial material, int type, ItemStack repairItem, String textureBase){ super(material, 0, type); this.repairItem = repairItem; this.name = name; String texture = ModUtil.MOD_ID_LOWER+":textures/armor/"+textureBase; textures = new String[]{texture+"1.png", texture+"2.png"}; - //Fixes vanilla's weird durability handling - this.setMaxDamage(material.getDurability(type)/10); - this.register(); } @@ -79,13 +76,7 @@ public class ItemArmorAA extends ItemArmor{ @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ - int[] idsStack = OreDictionary.getOreIDs(stack); - for(int id : idsStack){ - if(OreDictionary.getOreName(id).equals(repairItem)){ - return true; - } - } - return false; + return ItemUtil.areItemsEqual(this.repairItem, stack, false); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAxeAA.java index 7ca51cece..1f27b2242 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemAxeAA.java @@ -14,29 +14,27 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.creative.CreativeTab; +import de.ellpeck.actuallyadditions.util.ItemUtil; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class ItemAxeAA extends ItemAxe{ private String name; private EnumRarity rarity; - private String repairItem; + private ItemStack repairItem; - public ItemAxeAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ + public ItemAxeAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.repairItem = repairItem; this.name = unlocalizedName; this.rarity = rarity; - this.setMaxDamage(this.getMaxDamage()*4); - this.register(); } @@ -61,13 +59,7 @@ public class ItemAxeAA extends ItemAxe{ @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ - int[] idsStack = OreDictionary.getOreIDs(stack); - for(int id : idsStack){ - if(OreDictionary.getOreName(id).equals(repairItem)){ - return true; - } - } - return false; + return ItemUtil.areItemsEqual(this.repairItem, stack, false); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemHoeAA.java index 2bf1bb512..5d419eab2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemHoeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemHoeAA.java @@ -14,6 +14,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.creative.CreativeTab; +import de.ellpeck.actuallyadditions.util.ItemUtil; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; @@ -21,23 +22,20 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class ItemHoeAA extends ItemHoe{ private String name; private EnumRarity rarity; - private String repairItem; + private ItemStack repairItem; - public ItemHoeAA(Item.ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ + public ItemHoeAA(Item.ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.repairItem = repairItem; this.name = unlocalizedName; this.rarity = rarity; - this.setMaxDamage(this.getMaxDamage()*4); - this.register(); } @@ -67,13 +65,7 @@ public class ItemHoeAA extends ItemHoe{ @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ - int[] idsStack = OreDictionary.getOreIDs(stack); - for(int id : idsStack){ - if(OreDictionary.getOreName(id).equals(repairItem)){ - return true; - } - } - return false; + return ItemUtil.areItemsEqual(this.repairItem, stack, false); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java index c53ae2dbc..f35b74d63 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemPickaxeAA.java @@ -14,29 +14,27 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.creative.CreativeTab; +import de.ellpeck.actuallyadditions.util.ItemUtil; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class ItemPickaxeAA extends ItemPickaxe{ private String name; private EnumRarity rarity; - private String repairItem; + private ItemStack repairItem; - public ItemPickaxeAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ + public ItemPickaxeAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.repairItem = repairItem; this.name = unlocalizedName; this.rarity = rarity; - this.setMaxDamage(this.getMaxDamage()*4); - this.register(); } @@ -61,13 +59,7 @@ public class ItemPickaxeAA extends ItemPickaxe{ @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ - int[] idsStack = OreDictionary.getOreIDs(stack); - for(int id : idsStack){ - if(OreDictionary.getOreName(id).equals(repairItem)){ - return true; - } - } - return false; + return ItemUtil.areItemsEqual(this.repairItem, stack, false); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemShovelAA.java index 5497b3592..f973aa76a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemShovelAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemShovelAA.java @@ -14,6 +14,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.creative.CreativeTab; +import de.ellpeck.actuallyadditions.util.ItemUtil; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; @@ -21,23 +22,20 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class ItemShovelAA extends ItemSpade{ private String name; private EnumRarity rarity; - private String repairItem; + private ItemStack repairItem; - public ItemShovelAA(Item.ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ + public ItemShovelAA(Item.ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.repairItem = repairItem; this.name = unlocalizedName; this.rarity = rarity; - this.setMaxDamage(this.getMaxDamage()*4); - this.register(); } @@ -62,13 +60,7 @@ public class ItemShovelAA extends ItemSpade{ @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ - int[] idsStack = OreDictionary.getOreIDs(stack); - for(int id : idsStack){ - if(OreDictionary.getOreName(id).equals(repairItem)){ - return true; - } - } - return false; + return ItemUtil.areItemsEqual(this.repairItem, stack, false); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemSwordAA.java index d06e55ea7..8ef00b362 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemSwordAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/base/ItemSwordAA.java @@ -15,29 +15,27 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase; import de.ellpeck.actuallyadditions.creative.CreativeTab; +import de.ellpeck.actuallyadditions.util.ItemUtil; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class ItemSwordAA extends ItemSword{ private String name; private EnumRarity rarity; - private String repairItem; + private ItemStack repairItem; - public ItemSwordAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ + public ItemSwordAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.repairItem = repairItem; this.name = unlocalizedName; this.rarity = rarity; - this.setMaxDamage(this.getMaxDamage()*4); - this.register(); } @@ -66,13 +64,7 @@ public class ItemSwordAA extends ItemSword{ @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ - int[] idsStack = OreDictionary.getOreIDs(stack); - for(int id : idsStack){ - if(OreDictionary.getOreName(id).equals(repairItem)){ - return true; - } - } - return false; + return ItemUtil.areItemsEqual(this.repairItem, stack, false); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/material/InitArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/material/InitArmorMaterials.java index 9aafec1f3..6d4f85a91 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/material/InitArmorMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/material/InitArmorMaterials.java @@ -11,20 +11,34 @@ package de.ellpeck.actuallyadditions.material; import de.ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; public class InitArmorMaterials{ - public static ItemArmor.ArmorMaterial armorMaterialEmerald; - public static ItemArmor.ArmorMaterial armorMaterialObsidian; - public static ItemArmor.ArmorMaterial armorMaterialQuartz; + public static ArmorMaterial armorMaterialEmerald; + public static ArmorMaterial armorMaterialObsidian; + public static ArmorMaterial armorMaterialQuartz; + + public static ArmorMaterial armorMaterialCrystalRed; + public static ArmorMaterial armorMaterialCrystalBlue; + public static ArmorMaterial armorMaterialCrystalLightBlue; + public static ArmorMaterial armorMaterialCrystalBlack; + public static ArmorMaterial armorMaterialCrystalGreen; + public static ArmorMaterial armorMaterialCrystalWhite; public static void init(){ ModUtil.LOGGER.info("Initializing Armor Materials..."); - armorMaterialEmerald = EnumHelper.addArmorMaterial("armorMaterialEmerald", 1500, new int[]{5, 9, 8, 5}, 15); - armorMaterialObsidian = EnumHelper.addArmorMaterial("armorMaterialObsidian", 7000, new int[]{3, 4, 3, 1}, 10); - armorMaterialQuartz = EnumHelper.addArmorMaterial("armorMaterialQuartz", 200, new int[]{3, 6, 5, 3}, 8); + armorMaterialEmerald = EnumHelper.addArmorMaterial("armorMaterialEmerald", 50, new int[]{5, 9, 8, 5}, 15); + armorMaterialObsidian = EnumHelper.addArmorMaterial("armorMaterialObsidian", 120, new int[]{3, 4, 3, 1}, 10); + armorMaterialQuartz = EnumHelper.addArmorMaterial("armorMaterialQuartz", 20, new int[]{3, 6, 5, 3}, 8); + + armorMaterialCrystalRed = EnumHelper.addArmorMaterial("armorMaterialCrystalRed", 18, new int[]{3, 7, 6, 3}, 9); + armorMaterialCrystalBlue = EnumHelper.addArmorMaterial("armorMaterialCrystalBlue", 18, new int[]{3, 7, 6, 3}, 10); + armorMaterialCrystalLightBlue = EnumHelper.addArmorMaterial("armorMaterialCrystalLightBlue", 35, new int[]{7, 9, 7, 5}, 12); + armorMaterialCrystalBlack = EnumHelper.addArmorMaterial("armorMaterialCrystalBlack", 12, new int[]{1, 4, 3, 1}, 13); + armorMaterialCrystalGreen = EnumHelper.addArmorMaterial("armorMaterialCrystalGreen", 60, new int[]{7, 10, 9, 6}, 18); + armorMaterialCrystalWhite = EnumHelper.addArmorMaterial("armorMaterialCrystalWhite", 18, new int[]{4, 7, 6, 4}, 11); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/material/InitToolMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/material/InitToolMaterials.java index ec1132dfc..7ddf4364f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/material/InitToolMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/material/InitToolMaterials.java @@ -20,6 +20,13 @@ public class InitToolMaterials{ public static ToolMaterial toolMaterialObsidian; public static ToolMaterial toolMaterialQuartz; + public static ToolMaterial toolMaterialCrystalRed; + public static ToolMaterial toolMaterialCrystalBlue; + public static ToolMaterial toolMaterialCrystalLightBlue; + public static ToolMaterial toolMaterialCrystalBlack; + public static ToolMaterial toolMaterialCrystalGreen; + public static ToolMaterial toolMaterialCrystalWhite; + public static void init(){ ModUtil.LOGGER.info("Initializing Tool Materials..."); @@ -27,6 +34,13 @@ public class InitToolMaterials{ toolMaterialObsidian = EnumHelper.addToolMaterial("toolMaterialObsidian", 3, 8000, 4.0F, 2.0F, 15); toolMaterialQuartz = EnumHelper.addToolMaterial("toolMaterialQuartz", 2, 280, 6.5F, 2.0F, 10); + toolMaterialCrystalRed = EnumHelper.addToolMaterial("toolMaterialCrystalRed", 2, 300, 7.0F, 2.25F, 12); + toolMaterialCrystalBlue = EnumHelper.addToolMaterial("toolMaterialCrystalBlue", 2, 300, 7.0F, 2.25F, 12); + toolMaterialCrystalLightBlue = EnumHelper.addToolMaterial("toolMaterialCrystalLightBlue", 3, 1600, 9.0F, 4.0F, 14); + toolMaterialCrystalBlack = EnumHelper.addToolMaterial("toolMaterialCrystalBlack", 2, 280, 6.0F, 2.0F, 8); + toolMaterialCrystalGreen = EnumHelper.addToolMaterial("toolMaterialCrystalGreen", 4, 2200, 9.5F, 5.5F, 18); + toolMaterialCrystalWhite = EnumHelper.addToolMaterial("toolMaterialCrystalWhite", 2, 280, 6.25F, 2.5F, 15); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/ore/InitOreDict.java b/src/main/java/de/ellpeck/actuallyadditions/ore/InitOreDict.java index a51206c46..d27a77837 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/ore/InitOreDict.java +++ b/src/main/java/de/ellpeck/actuallyadditions/ore/InitOreDict.java @@ -13,12 +13,12 @@ package de.ellpeck.actuallyadditions.ore; import de.ellpeck.actuallyadditions.blocks.InitBlocks; import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; import de.ellpeck.actuallyadditions.items.InitItems; +import de.ellpeck.actuallyadditions.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.items.metalists.TheDusts; import de.ellpeck.actuallyadditions.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -31,7 +31,6 @@ public class InitOreDict{ //Vanilla Ores addOre(Items.coal, "coal"); - addOre(Blocks.obsidian, "obsidian"); //Ores for Pulverizers etc. addOre(InitItems.itemDust, TheDusts.IRON.ordinal(), "dustIron"); @@ -60,6 +59,9 @@ public class InitOreDict{ //For Crafting addOre(InitItems.itemMisc, TheMiscItems.BLACK_DYE.ordinal(), "dyeBlack"); + + //For Repairing + addOre(InitItems.itemCrystal, TheCrystals.REDSTONE.ordinal(), "actAddCrystalRed"); } private static void addOre(ItemStack stack, String name){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index f7505c468..fea45c3a9 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -318,6 +318,60 @@ item.actuallyadditions.itemColorLens.name=Lens of Color item.actuallyadditions.itemExplosionLens.name=Lens of Detonation item.actuallyadditions.itemDamageLens.name=Lens of Certain Death item.actuallyadditions.itemCrateKeeper.name=Storage Crate Keeper +item.actuallyadditions.itemPickaxeCrystalRed=Restonia Crystal Pickaxe +item.actuallyadditions.itemAxeCrystalRed=Restonia Crystal Axe +item.actuallyadditions.itemShovelCrystalRed=Restonia Crystal Shovel +item.actuallyadditions.itemSwordCrystalRed=Restonia Crystal Sword +item.actuallyadditions.itemHoeCrystalRed=Restonia Crystal Hoe +item.actuallyadditions.itemHelmCrystalRed=Restonia Crystal Helmet +item.actuallyadditions.itemChestCrystalRed=Restonia Crystal Chestplate +item.actuallyadditions.itemPantsCrystalRed=Restonia Crystal Pants +item.actuallyadditions.itemBootsCrystalRed=Restonia Crystal Boots +item.actuallyadditions.itemPickaxeCrystalBlue=Palis Crystal Pickaxe +item.actuallyadditions.itemAxeCrystalBlue=Palis Crystal Axe +item.actuallyadditions.itemShovelCrystalBlue=Palis Crystal Shovel +item.actuallyadditions.itemSwordCrystalBlue=Palis Crystal Sword +item.actuallyadditions.itemHoeCrystalBlue=Palis Crystal Hoe +item.actuallyadditions.itemHelmCrystalBlue=Palis Crystal Helmet +item.actuallyadditions.itemChestCrystalBlue=Palis Crystal Chestplate +item.actuallyadditions.itemPantsCrystalBlue=Palis Crystal Pants +item.actuallyadditions.itemBootsCrystalBlue=Palis Crystal Boots +item.actuallyadditions.itemPickaxeCrystalLightBlue=Diamatine Crystal Pickaxe +item.actuallyadditions.itemAxeCrystalLightBlue=Diamatine Crystal Axe +item.actuallyadditions.itemShovelCrystalLightBlue=Diamatine Crystal Shovel +item.actuallyadditions.itemSwordCrystalLightBlue=Diamatine Crystal Sword +item.actuallyadditions.itemHoeCrystalLightBlue=Diamatine Crystal Hoe +item.actuallyadditions.itemHelmCrystalLightBlue=Diamatine Crystal Helmet +item.actuallyadditions.itemChestCrystalLightBlue=Diamatine Crystal Chestplate +item.actuallyadditions.itemPantsCrystalLightBlue=Diamatine Crystal Pants +item.actuallyadditions.itemBootsCrystalLightBlue=Diamatine Crystal Boots +item.actuallyadditions.itemPickaxeCrystalBlack=Void Crystal Pickaxe +item.actuallyadditions.itemAxeCrystalBlack=Void Crystal Axe +item.actuallyadditions.itemShovelCrystalBlack=Void Crystal Shovel +item.actuallyadditions.itemSwordCrystalBlack=Void Crystal Sword +item.actuallyadditions.itemHoeCrystalBlack=Void Crystal Hoe +item.actuallyadditions.itemHelmCrystalBlack=Void Crystal Helmet +item.actuallyadditions.itemChestCrystalBlack=Void Crystal Chestplate +item.actuallyadditions.itemPantsCrystalBlack=Void Crystal Pants +item.actuallyadditions.itemBootsCrystalBlack=Void Crystal Boots +item.actuallyadditions.itemPickaxeCrystalGreen=Emeradic Crystal Pickaxe +item.actuallyadditions.itemAxeCrystalGreen=Emeradic Crystal Axe +item.actuallyadditions.itemShovelCrystalGreen=Emeradic Crystal Shovel +item.actuallyadditions.itemSwordCrystalGreen=Emeradic Crystal Sword +item.actuallyadditions.itemHoeCrystalGreen=Emeradic Crystal Hoe +item.actuallyadditions.itemHelmCrystalGreen=Emeradic Crystal Helmet +item.actuallyadditions.itemChestCrystalGreen=Emeradic Crystal Chest +item.actuallyadditions.itemPantsCrystalGreen=Emeradic Crystal Pants +item.actuallyadditions.itemBootsCrystalGreen=Emeradic Crystal Boots +item.actuallyadditions.itemPickaxeCrystalWhite=Enori Crystal Pickaxe +item.actuallyadditions.itemAxeCrystalWhite=Enori Crystal Axe +item.actuallyadditions.itemShovelCrystalWhite=Enori Crystal Shovel +item.actuallyadditions.itemSwordCrystalWhite=Enori Crystal Sword +item.actuallyadditions.itemHoeCrystalWhite=Enori Crystal Hoe +item.actuallyadditions.itemHelmCrystalWhite=Enori Crystal Helmet +item.actuallyadditions.itemChestCrystalWhite=Enori Crystal Chest +item.actuallyadditions.itemPantsCrystalWhite=Enori Crystal Pants +item.actuallyadditions.itemBootsCrystalWhite=Enori Crystal Boots #Tooltips tooltip.actuallyadditions.onSuffix.desc=On