mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 20:22:33 +00:00
Added the Band of Mana.
This commit is contained in:
1 parent
04e72b993a
commit
830d67e8af
8 files changed
+118
-10
No files matched your search
@@ -37,13 +37,15 @@ public final class ManaItemHandler {
|
||||
IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player);
|
||||
|
||||
List<ItemStack> 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<ItemStack> 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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -138,7 +138,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem {
|
||||
|
||||
@Override
|
||||
public boolean canReceiveManaFromItem(ItemStack stack, ItemStack otherStack) {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. 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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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",
|
||||
|
||||
@@ -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:
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Reference in new issue
Block a user