diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 68a8d35a4..cb8f2e40a 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -91,7 +91,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.tinyPlanet); addItem(ModItems.manaRing); addItem(ModItems.auraRing); - + addItem(ModItems.manaRingGreater); + addItem(ModItems.auraRingGreater); + addItem(ModItems.manaTablet); addItem(ModItems.manaMirror); addBlock(ModBlocks.pool); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index cf2b0e6cb..4ad44aee0 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -98,6 +98,10 @@ public final class ModCrafingRecipes { public static IRecipe recipeTerrasteelBoots; public static IRecipe recipeTerraSword; public static IRecipe recipeTinyPlanet; + public static IRecipe recipeManaRing; + public static IRecipe recipeAuraRing; + public static IRecipe recipeGreaterManaRing; + public static IRecipe recipeGreaterAuraRing; public static void init() { // Lexicon Recipe @@ -466,6 +470,34 @@ public final class ModCrafingRecipes { 'L', LibOreDict.LIVING_ROCK, 'P', LibOreDict.MANA_PEARL); recipeTinyPlanet = BotaniaAPI.getLatestAddedRecipe(); + + // Mana Band Recipe + addOreDictRecipe(new ItemStack(ModItems.manaRing), + "TI ", "I I", " I ", + 'T', new ItemStack(ModItems.manaTablet), + 'I', LibOreDict.MANA_STEEL); + recipeManaRing = BotaniaAPI.getLatestAddedRecipe(); + + // Aura Band Recipe + addOreDictRecipe(new ItemStack(ModItems.auraRing), + "RI ", "I I", " I ", + 'R', LibOreDict.RUNE[8], + 'I', LibOreDict.MANA_STEEL); + recipeAuraRing = BotaniaAPI.getLatestAddedRecipe(); + + // Greater Mana Band Recipe + addOreDictRecipe(new ItemStack(ModItems.manaRingGreater), + "IRI", + 'I', LibOreDict.TERRA_STEEL, + 'R', new ItemStack(ModItems.manaRing)); + recipeGreaterManaRing = BotaniaAPI.getLatestAddedRecipe(); + + // Greater Aura Band Recipe + addOreDictRecipe(new ItemStack(ModItems.auraRingGreater), + "IRI", + 'I', LibOreDict.TERRA_STEEL, + 'R', new ItemStack(ModItems.auraRing)); + recipeGreaterAuraRing = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index f40043a16..dfe2a2d7a 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -24,6 +24,8 @@ import vazkii.botania.common.item.equipment.armor.ItemTerrasteelChest; import vazkii.botania.common.item.equipment.armor.ItemTerrasteelHelm; import vazkii.botania.common.item.equipment.armor.ItemTerrasteelLegs; import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; +import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; +import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; import vazkii.botania.common.item.equipment.bauble.ItemManaRing; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; import vazkii.botania.common.item.equipment.tool.ItemManasteelAxe; @@ -72,7 +74,9 @@ public final class ModItems { public static Item tinyPlanet; public static Item manaRing; public static Item auraRing; - + public static Item manaRingGreater; + public static Item auraRingGreater; + public static void init() { lexicon = new ItemLexicon(); petal = new ItemPetal(); @@ -110,6 +114,8 @@ public final class ModItems { tinyPlanet = new ItemTinyPlanet(); manaRing = new ItemManaRing(); auraRing = new ItemAuraRing(); + manaRingGreater = new ItemGreaterManaRing(); + auraRingGreater = new ItemGreaterAuraRing(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java new file mode 100644 index 000000000..1f61e49c8 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java @@ -0,0 +1,38 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Apr 24, 2014, 5:12:53 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.lib.LibItemNames; +import baubles.api.BaubleType; + +public class ItemGreaterAuraRing extends ItemBauble { + + public ItemGreaterAuraRing() { + super(LibItemNames.AURA_RING_GREATER); + } + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + if(player instanceof EntityPlayer) + ManaItemHandler.dispatchManaExact(stack, (EntityPlayer) player, player.worldObj.getTotalWorldTime() % 3 == 0 ? 2 : 1, true); + } + + @Override + public BaubleType getBaubleType(ItemStack itemstack) { + return BaubleType.RING; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemGreaterManaRing.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemGreaterManaRing.java new file mode 100644 index 000000000..c844f89f9 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemGreaterManaRing.java @@ -0,0 +1,30 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Apr 24, 2014, 5:20:54 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import net.minecraft.item.ItemStack; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemGreaterManaRing extends ItemManaRing { + + private static final int MAX_MANA = ItemManaRing.MAX_MANA * 4; + + public ItemGreaterManaRing() { + super(LibItemNames.MANA_RING_GREATER); + } + + @Override + public int getMaxMana(ItemStack stack) { + return MAX_MANA; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 41fba119a..c0023f8d5 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -24,12 +24,17 @@ import baubles.api.BaubleType; public class ItemManaRing extends ItemBauble implements IManaItem { - private static final int MAX_MANA = 500000; + protected static final int MAX_MANA = 500000; private static final String TAG_MANA = "mana"; public ItemManaRing() { - super(LibItemNames.MANA_RING); + this(LibItemNames.MANA_RING); + setMaxDamage(1000); + } + + public ItemManaRing(String name) { + super(name); setMaxDamage(1000); } @@ -46,7 +51,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem { @Override public int getDamage(ItemStack stack) { float mana = getMana(stack); - return 1000 - (int) (mana / MAX_MANA * 1000); + return 1000 - (int) (mana / getMaxMana(stack) * 1000); } @Override @@ -70,7 +75,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem { @Override public void addMana(ItemStack stack, int mana) { - setMana(stack, Math.min(getMana(stack) + mana, MAX_MANA)); + setMana(stack, Math.min(getMana(stack) + mana, getMaxMana(stack))); } @Override diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index bdbdb00ed..bf8761ffa 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -107,6 +107,8 @@ public final class LexiconData { public static LexiconEntry terraBlade; public static LexiconEntry tinyPlanet; + public static LexiconEntry manaRing; + public static LexiconEntry auraRing; public static LexiconEntry unstableBlocks; public static LexiconEntry decorativeBlocks; @@ -315,6 +317,12 @@ public final class LexiconData { tinyPlanet = new BLexiconEntry(LibLexicon.BAUBLE_TINY_PLANET, categoryBaubles); tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTinyPlanet)); + manaRing = new BLexiconEntry(LibLexicon.BAUBLE_MANA_RING, categoryBaubles); + manaRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeManaRing), new PageCraftingRecipe("2", ModCrafingRecipes.recipeGreaterManaRing)); + + auraRing = new BLexiconEntry(LibLexicon.BAUBLE_AURA_RING, categoryBaubles); + auraRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeAuraRing), new PageCraftingRecipe("2", ModCrafingRecipes.recipeGreaterAuraRing)); + // MISCLENAEOUS ENTRIES unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCrafingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipesSignalFlares)); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 8f6523d14..ad2845020 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -51,6 +51,8 @@ public final class LibItemNames { public static final String TINY_PLANET = LibResources.PREFIX_MOD + "tinyPlanet"; public static final String MANA_RING = LibResources.PREFIX_MOD + "manaRing"; public static final String AURA_RING = LibResources.PREFIX_MOD + "auraRing"; + public static final String MANA_RING_GREATER = LibResources.PREFIX_MOD + "manaRingGreater"; + public static final String AURA_RING_GREATER = LibResources.PREFIX_MOD + "auraRingGreater"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 59709c5f8..533f231d4 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -89,7 +89,9 @@ public final class LibLexicon { public static final String TOOL_TERRA_SWORD = "terraSword"; public static final String BAUBLE_TINY_PLANET = "tinyPlanet"; - + public static final String BAUBLE_MANA_RING = "manaRing"; + public static final String BAUBLE_AURA_RING = "auraRing"; + public static final String MISC_UNSTABLE_BLOCKS = "unstableBlocks"; public static final String MISC_DECORATIVE_BLOCKS = "decorativeBlocks"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 98580c19b..960a8a447 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -291,6 +291,8 @@ item.botania:terraSword.name=Terra Blade item.botania:tinyPlanet.name=Tiny Planet item.botania:manaRing.name=Band of Mana item.botania:auraRing.name=Band of Aura +item.botania:manaRingGreater.name=Greater Band of Mana +item.botania:auraRingGreater.name=Greater Band of Aura # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: @@ -684,9 +686,21 @@ botania.page.terraSword1=No Broken Hero Sword # - BAUBLES # -- TINY PLANET botania.entry.tinyPlanet=Tiny Planet -botania.page.tinyPlanet0=The &1Tiny Planet&0 is a bauble with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her. +botania.page.tinyPlanet0=The &1Tiny Planet&0 is a &4Bauble&0 with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her. botania.page.tinyPlanet1=Clearly from rebirth +# -- BAND OF MANA +botania.entry.manaRing=Band of Mana +botania.page.manaRing0=Combining a &1Mana Tablet&0 with some &1Manasteel&0 creates an easilly worn &4Ring&0, that functions exactly similar to the tablet used to make it, but can be worn as a &4Bauble&0.
Using some &1Terrasteel&0 allows for an upgrade, which lets it store about four times as much &4Mana&0. +botania.page.manaRing1=Creating the ring +botania.page.manaRing2=Upgrading the ring + +# -- BAND OF AURA +botania.entry.auraRing=Band of Aura +botania.page.auraRing0=The &1Band of Aura&0 is a bit of a deviation from the typical &1Band of Mana&0, in which, instead of storing &4Mana&0, it slowly, while equipped, creates it and stores it into &4Mana&0 containing items in the wearer's inventory.
Using some &1Terrasteel&0 allows for an upgrade, which lets it generate &4Mana&0 at a significantly faster rate. +botania.page.auraRing1=Creating the ring +botania.page.auraRing2=Upgrading the ring + # - MISCLANEOUS # -- UNSTABLE CUBE botania.entry.unstableBlocks=Unstable Cubes diff --git a/resources/assets/botania/textures/items/auraRingGreater.png b/resources/assets/botania/textures/items/auraRingGreater.png new file mode 100644 index 000000000..96ae05e9e Binary files /dev/null and b/resources/assets/botania/textures/items/auraRingGreater.png differ diff --git a/resources/assets/botania/textures/items/manaRingGreater.png b/resources/assets/botania/textures/items/manaRingGreater.png new file mode 100644 index 000000000..bfb625eab Binary files /dev/null and b/resources/assets/botania/textures/items/manaRingGreater.png differ