From 8f3b58a730c6dcddbe905168aa8fa3f7b2b25f79 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 1 Jan 2016 23:44:22 +0100 Subject: [PATCH] MOAR PAXELS --- .../crafting/ToolCrafting.java | 43 +++++++++++++++++++ .../creative/CreativeTab.java | 6 +++ .../actuallyadditions/items/InitItems.java | 15 ++++++- .../assets/actuallyadditions/lang/en_US.lang | 6 +++ 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java index 17527ace4..0f1bcb9dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/crafting/ToolCrafting.java @@ -111,6 +111,49 @@ public class ToolCrafting{ new ItemStack(InitItems.itemShovelQuartz), new ItemStack(InitItems.itemHoeQuartz))); recipesPaxels.add(Util.GetRecipes.lastIRecipe()); + + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalRed), + new ItemStack(InitItems.itemAxeCrystalRed), + new ItemStack(InitItems.itemPickaxeCrystalRed), + new ItemStack(InitItems.itemSwordCrystalRed), + new ItemStack(InitItems.itemShovelCrystalRed), + new ItemStack(InitItems.itemHoeCrystalRed))); + recipesPaxels.add(Util.GetRecipes.lastIRecipe()); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalGreen), + new ItemStack(InitItems.itemAxeCrystalGreen), + new ItemStack(InitItems.itemPickaxeCrystalGreen), + new ItemStack(InitItems.itemSwordCrystalGreen), + new ItemStack(InitItems.itemShovelCrystalGreen), + new ItemStack(InitItems.itemHoeCrystalGreen))); + recipesPaxels.add(Util.GetRecipes.lastIRecipe()); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalBlue), + new ItemStack(InitItems.itemAxeCrystalBlue), + new ItemStack(InitItems.itemPickaxeCrystalBlue), + new ItemStack(InitItems.itemSwordCrystalBlue), + new ItemStack(InitItems.itemShovelCrystalBlue), + new ItemStack(InitItems.itemHoeCrystalBlue))); + recipesPaxels.add(Util.GetRecipes.lastIRecipe()); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalLightBlue), + new ItemStack(InitItems.itemAxeCrystalLightBlue), + new ItemStack(InitItems.itemPickaxeCrystalLightBlue), + new ItemStack(InitItems.itemSwordCrystalLightBlue), + new ItemStack(InitItems.itemShovelCrystalLightBlue), + new ItemStack(InitItems.itemHoeCrystalLightBlue))); + recipesPaxels.add(Util.GetRecipes.lastIRecipe()); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalBlack), + new ItemStack(InitItems.itemAxeCrystalBlack), + new ItemStack(InitItems.itemPickaxeCrystalBlack), + new ItemStack(InitItems.itemSwordCrystalBlack), + new ItemStack(InitItems.itemShovelCrystalBlack), + new ItemStack(InitItems.itemHoeCrystalBlack))); + recipesPaxels.add(Util.GetRecipes.lastIRecipe()); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalWhite), + new ItemStack(InitItems.itemAxeCrystalWhite), + new ItemStack(InitItems.itemPickaxeCrystalWhite), + new ItemStack(InitItems.itemSwordCrystalWhite), + new ItemStack(InitItems.itemShovelCrystalWhite), + new ItemStack(InitItems.itemHoeCrystalWhite))); + recipesPaxels.add(Util.GetRecipes.lastIRecipe()); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java index 78dae2105..d8740753b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -184,6 +184,12 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.emeraldPaxel); add(InitItems.obsidianPaxel); add(InitItems.quartzPaxel); + add(InitItems.itemPaxelCrystalRed); + add(InitItems.itemPaxelCrystalBlue); + add(InitItems.itemPaxelCrystalLightBlue); + add(InitItems.itemPaxelCrystalBlack); + add(InitItems.itemPaxelCrystalGreen); + add(InitItems.itemPaxelCrystalWhite); InitForeignPaxels.addToCreativeTab(); add(InitBlocks.blockCrystal); diff --git a/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java index f940c8941..2baec0b92 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/items/InitItems.java @@ -146,6 +146,7 @@ public class InitItems{ public static Item itemChestCrystalRed; public static Item itemPantsCrystalRed; public static Item itemBootsCrystalRed; + public static Item itemPaxelCrystalRed; public static Item itemPickaxeCrystalBlue; public static Item itemAxeCrystalBlue; @@ -156,6 +157,7 @@ public class InitItems{ public static Item itemChestCrystalBlue; public static Item itemPantsCrystalBlue; public static Item itemBootsCrystalBlue; + public static Item itemPaxelCrystalBlue; public static Item itemPickaxeCrystalLightBlue; public static Item itemAxeCrystalLightBlue; @@ -166,6 +168,7 @@ public class InitItems{ public static Item itemChestCrystalLightBlue; public static Item itemPantsCrystalLightBlue; public static Item itemBootsCrystalLightBlue; + public static Item itemPaxelCrystalLightBlue; public static Item itemPickaxeCrystalBlack; public static Item itemAxeCrystalBlack; @@ -176,6 +179,7 @@ public class InitItems{ public static Item itemChestCrystalBlack; public static Item itemPantsCrystalBlack; public static Item itemBootsCrystalBlack; + public static Item itemPaxelCrystalBlack; public static Item itemPickaxeCrystalGreen; public static Item itemAxeCrystalGreen; @@ -186,6 +190,7 @@ public class InitItems{ public static Item itemChestCrystalGreen; public static Item itemPantsCrystalGreen; public static Item itemBootsCrystalGreen; + public static Item itemPaxelCrystalGreen; public static Item itemPickaxeCrystalWhite; public static Item itemAxeCrystalWhite; @@ -196,6 +201,7 @@ public class InitItems{ public static Item itemChestCrystalWhite; public static Item itemPantsCrystalWhite; public static Item itemBootsCrystalWhite; + public static Item itemPaxelCrystalWhite; public static void init(){ ModUtil.LOGGER.info("Initializing Items..."); @@ -302,7 +308,8 @@ public class InitItems{ 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"); - + itemPaxelCrystalRed = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalRed, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), "itemPaxelCrystalRed", EnumRarity.rare, 16711689); + 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); @@ -312,6 +319,7 @@ public class InitItems{ 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"); + itemPaxelCrystalBlue = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), "itemPaxelCrystalBlue", EnumRarity.rare, 3014911); 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); @@ -322,6 +330,7 @@ public class InitItems{ 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"); + itemPaxelCrystalLightBlue = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalLightBlue, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), "itemPaxelCrystalLightBlue", EnumRarity.rare, 4093108); 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); @@ -332,6 +341,7 @@ public class InitItems{ 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"); + itemPaxelCrystalBlack = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalBlack, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), "itemPaxelCrystalBlack", EnumRarity.rare, 2631982); 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); @@ -342,6 +352,7 @@ public class InitItems{ 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"); + itemPaxelCrystalGreen = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalGreen, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), "itemPaxelCrystalGreen", EnumRarity.rare, 46848); 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); @@ -352,6 +363,6 @@ public class InitItems{ 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"); - + itemPaxelCrystalWhite = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemPaxelCrystalWhite", EnumRarity.rare, 14606302); } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index dfae102c7..0e6e0812d 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -372,6 +372,12 @@ item.actuallyadditions.itemHelmCrystalWhite.name=Enori Crystal Helmet item.actuallyadditions.itemChestCrystalWhite.name=Enori Crystal Chest item.actuallyadditions.itemPantsCrystalWhite.name=Enori Crystal Pants item.actuallyadditions.itemBootsCrystalWhite.name=Enori Crystal Boots +item.actuallyadditions.itemPaxelCrystalRed.name=Restonia Crystal AIOT +item.actuallyadditions.itemPaxelCrystalBlue.name=Palis Crystal AIOT +item.actuallyadditions.itemPaxelCrystalLightBlue.name=Diamatine Crystal AIOT +item.actuallyadditions.itemPaxelCrystalBlack.name=Void Crystal AIOT +item.actuallyadditions.itemPaxelCrystalWhite.name=Enori Crystal AIOT +item.actuallyadditions.itemPaxelCrystalGreen.name=Emeradic Crystal AIOT #Tooltips tooltip.actuallyadditions.onSuffix.desc=On