upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-12 08:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:MysteriousAges/thaumicbees

Browse Source 
Conflicts:
	thaumicbees_src/thaumicbees/main/Config.java
This commit is contained in:
MysteriousAges committed 2013-02-27 19:29:18 -08:00
2 parents aed979a19f 92ace4e9a3
commit c8be483bf0
2 files changed
+52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

thaumicbees_src/thaumicbees/item/ItemReinforcedScoop.java
+46
View File
@@ -0,0 +1,46 @@
package thaumicbees.item;
import thaumcraft.api.IVisRepairable;
import thaumcraft.api.ThaumcraftApi;
import thaumicbees.main.CommonProxy;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeHooks;
public class ItemReinforcedScoop extends Item implements IVisRepairable
{
public ItemReinforcedScoop(int itemID)
{
super(itemID);
this.setMaxStackSize(1);
this.setMaxDamage(20);
this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE);
}
@Override
public float getStrVsBlock(ItemStack itemStack, Block block)
{
return 1f;
}
@Override
public float getStrVsBlock(ItemStack itemStack, Block block, int metadata)
{
return ForgeHooks.isToolEffective(itemStack, block, metadata) ? 4f : getStrVsBlock(itemStack, block);
}
@Override
public void doRepair(ItemStack stack, Entity e)
{
if (stack.getItemDamage() > 0)
{
if (ThaumcraftApi.decreaseClosestAura(e.worldObj, e.posX, e.posY, e.posZ, 1, true))
{
stack.damageItem(-1, (EntityLiving)e);
}
}
}
}
thaumicbees_src/thaumicbees/main/Config.java
+6
View File
@@ -13,6 +13,7 @@ import thaumicbees.item.ItemMagicHiveFrame;
import thaumicbees.item.ItemMiscResources;
import thaumicbees.item.ItemPollen;
import thaumicbees.item.ItemPropolis;
import thaumicbees.item.ItemReinforcedScoop;
import thaumicbees.item.ItemSolidFlux;
import thaumicbees.item.ItemWax;
import thaumicbees.item.types.CapsuleType;
@@ -41,6 +42,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.Property;
import net.minecraftforge.oredict.OreDictionary;
@@ -71,6 +73,7 @@ public class Config
public static ItemSolidFlux solidFlux;
public static ItemMiscResources miscResources;
public static ItemFood jellyBaby;
public static ItemReinforcedScoop thaumiumScoop;
//----- Liquid Capsules --------------------
public static ItemCapsule magicCapsule;
@@ -240,6 +243,9 @@ public class Config
jellyBaby.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE).setIconIndex(19).setItemName("jellyBabies");
voidCapsule = new ItemCapsule(CapsuleType.VOID, tbConfig.getItem("voidCapsule", itemIDBase++).getInt(), this.capsuleStackSizeMax);
thaumiumScoop = new ItemReinforcedScoop(tbConfig.getItem("reinforcedScoop", itemIDBase++).getInt());
MinecraftForge.setToolClass(thaumiumScoop, "scoop", 3);
}
private void doMiscConfig()