From 830d67e8af12764032b1aa6d7cef7e95225f4d82 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 24 Apr 2014 16:18:45 +0100 Subject: [PATCH] Added the Band of Mana. --- .../botania/api/mana/ManaItemHandler.java | 17 ++-- .../common/core/BotaniaCreativeTab.java | 3 +- .../botania/common/item/ItemManaTablet.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 5 +- .../item/equipment/bauble/ItemManaRing.java | 96 ++++++++++++++++++ .../botania/common/lib/LibItemNames.java | 4 +- resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/items/manaRing.png | Bin 0 -> 3293 bytes 8 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java create mode 100644 resources/assets/botania/textures/items/manaRing.png diff --git a/MODSRC/vazkii/botania/api/mana/ManaItemHandler.java b/MODSRC/vazkii/botania/api/mana/ManaItemHandler.java index 5e40e881f..b6da089c2 100644 --- a/MODSRC/vazkii/botania/api/mana/ManaItemHandler.java +++ b/MODSRC/vazkii/botania/api/mana/ManaItemHandler.java @@ -37,13 +37,15 @@ public final class ManaItemHandler { IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player); List stacks = new ArrayList(); - int size = mainInv.getSizeInventory(); + int invSize = mainInv.getSizeInventory(); + int size = invSize; if(baublesInv != null) size += baublesInv.getSizeInventory(); for(int i = 0; i < size; i++) { - IInventory inv = i >= mainInv.getSizeInventory() ? baublesInv : mainInv; - ItemStack stackInSlot = inv.getStackInSlot(i); + boolean useBaubles = i >= invSize; + IInventory inv = useBaubles ? baublesInv : mainInv; + ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); if(stackInSlot == stack) continue; @@ -80,15 +82,18 @@ public final class ManaItemHandler { IInventory mainInv = player.inventory; IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player); + System.out.println(baublesInv); List stacks = new ArrayList(); - int size = mainInv.getSizeInventory(); + int invSize = mainInv.getSizeInventory(); + int size = invSize; if(baublesInv != null) size += baublesInv.getSizeInventory(); for(int i = 0; i < size; i++) { - IInventory inv = i >= mainInv.getSizeInventory() ? baublesInv : mainInv; - ItemStack stackInSlot = inv.getStackInSlot(i); + boolean useBaubles = i >= invSize; + IInventory inv = useBaubles ? baublesInv : mainInv; + ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); if(stackInSlot == stack) continue; diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 0a470e7f3..c7ddc8e66 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -89,7 +89,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.terrasteelBoots); addItem(ModItems.tinyPlanet); - + addItem(ModItems.manaRing); + addItem(ModItems.manaTablet); addItem(ModItems.manaMirror); addBlock(ModBlocks.pool); diff --git a/MODSRC/vazkii/botania/common/item/ItemManaTablet.java b/MODSRC/vazkii/botania/common/item/ItemManaTablet.java index 6d3c1494a..a954521d6 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaTablet.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaTablet.java @@ -138,7 +138,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem { @Override public boolean canReceiveManaFromItem(ItemStack stack, ItemStack otherStack) { - return false; + return true; } @Override diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 930acc001..857938a60 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -23,6 +23,7 @@ import vazkii.botania.common.item.equipment.armor.ItemTerrasteelBoots; 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.ItemManaRing; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; import vazkii.botania.common.item.equipment.tool.ItemManasteelAxe; import vazkii.botania.common.item.equipment.tool.ItemManasteelPick; @@ -68,6 +69,7 @@ public final class ModItems { public static Item terrasteelBoots; public static Item terraSword; public static Item tinyPlanet; + public static Item manaRing; public static void init() { lexicon = new ItemLexicon(); @@ -104,7 +106,8 @@ public final class ModItems { terrasteelBoots = new ItemTerrasteelBoots(); terraSword = new ItemTerraSword(); tinyPlanet = new ItemTinyPlanet(); - + manaRing = new ItemManaRing(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java new file mode 100644 index 000000000..7fe03ed9c --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -0,0 +1,96 @@ +/** + * 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, 2:55:28 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lib.LibItemNames; +import baubles.api.BaubleType; + +public class ItemManaRing extends ItemBauble implements IManaItem { + + private static final int MAX_MANA = 50000; + + private static final String TAG_MANA = "mana"; + + public ItemManaRing() { + super(LibItemNames.MANA_RING); + setMaxDamage(1000); + } + + @Override + public BaubleType getBaubleType(ItemStack itemstack) { + return BaubleType.RING; + } + + @Override + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + par3List.add(new ItemStack(par1, 1, 10000)); + } + + @Override + public int getDamage(ItemStack stack) { + float mana = getMana(stack); + return 1000 - (int) (mana / MAX_MANA * 1000); + } + + @Override + public int getDisplayDamage(ItemStack stack) { + return getDamage(stack); + } + + public static void setMana(ItemStack stack, int mana) { + ItemNBTHelper.setInt(stack, TAG_MANA, mana); + } + + @Override + public int getMana(ItemStack stack) { + return ItemNBTHelper.getInt(stack, TAG_MANA, 0); + } + + @Override + public int getMaxMana(ItemStack stack) { + return MAX_MANA; + } + + @Override + public void addMana(ItemStack stack, int mana) { + setMana(stack, Math.min(getMana(stack) + mana, MAX_MANA)); + } + + @Override + public boolean canReceiveManaFromPool(ItemStack stack, TileEntity pool) { + return true; + } + + @Override + public boolean canReceiveManaFromItem(ItemStack stack, ItemStack otherStack) { + return true; + } + + @Override + public boolean canExportManaToPool(ItemStack stack, TileEntity pool) { + return true; + } + + @Override + public boolean canExportManaToItem(ItemStack stack, ItemStack otherStack) { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 5ffb7e396..8f6523d14 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -49,7 +49,9 @@ public final class LibItemNames { public static final String TERRASTEEL_BOOTS = LibResources.PREFIX_MOD + "terrasteelBoots"; public static final String TERRA_SWORD = LibResources.PREFIX_MOD + "terraSword"; 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[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", LibResources.PREFIX_MOD + "lensSpeed", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index e48575205..27633eb24 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -289,6 +289,7 @@ item.botania:terrasteelLegs.name=Terrasteel Leggings item.botania:terrasteelBoots.name=Terrasteel Boots item.botania:terraSword.name=Terra Blade item.botania:tinyPlanet.name=Tiny Planet +item.botnaia:manaRing.name=Band of Mana # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: diff --git a/resources/assets/botania/textures/items/manaRing.png b/resources/assets/botania/textures/items/manaRing.png new file mode 100644 index 0000000000000000000000000000000000000000..1e15cdd7fdf91cd6a72b65814f9a6c6e7d8d9fb3 GIT binary patch literal 3293 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 b)t>z00000NkvXXu0mjfo5eFf literal 0 HcmV?d00001