From c36f7526122c1eb5e4de254e514269614e6b590d Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 11 May 2015 13:28:01 -0400 Subject: [PATCH] Readded the Blood Frame --- build.properties | 4 +-- .../AlchemicalWizardry.java | 17 ++++++----- .../alchemicalWizardry/ModItems.java | 1 - .../common/items/forestry/ItemBloodFrame.java | 29 +++++++++++-------- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/build.properties b/build.properties index f910d56d..2df0e5a8 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Fri May 08 12:08:25 EDT 2015 +#Mon May 11 13:18:11 EDT 2015 mod_name=BloodMagic forge_version=10.13.3.1374-1.7.10 ccc_version=1.0.4.29 @@ -9,5 +9,5 @@ guideapi_version=1.0-14 package_group=com.wayoftime.bloodmagic mod_version=1.3.2aBeta minetweaker_version=Dev-1.7.10-3.0.9B +build_number=8 mc_version=1.7.10 -build_number=7 diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index db2866f9..6d93dbc8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -113,6 +113,7 @@ import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler; import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour; +import WayofTime.alchemicalWizardry.common.items.forestry.ItemBloodFrame; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth; @@ -1190,14 +1191,14 @@ public class AlchemicalWizardry { this.isForestryLoaded = true; -// ModItems.itemBloodFrame = new ItemBloodFrame(this.itemBloodFrameItemID).setUnlocalizedName("bloodFrame"); -// -// ItemStack provenFrame = GameRegistry.findItemStack("Forestry", "frameImpregnated", 1); -// -// if(provenFrame !=null) -// { -// AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.itemBloodFrame), provenFrame, 3, 30000, 20, 20, false); -// } + ModItems.itemBloodFrame = new ItemBloodFrame().setUnlocalizedName("bloodFrame"); + + ItemStack provenFrame = GameRegistry.findItemStack("Forestry", "frameImpregnated", 1); + + if(provenFrame !=null) + { + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.itemBloodFrame), provenFrame, 3, 30000, 20, 20, false); + } } else { this.isForestryLoaded = false; diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index ce548e9e..d6520283 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -511,6 +511,5 @@ public class ModItems GameRegistry.registerItem(ModItems.itemMailCatalogue, "itemMailCatalogue"); GameRegistry.registerItem(ModItems.itemIncense, "bloodMagicIncenseItem"); - //GameRegistry.registerItem(ModItems.itemBloodFrame, "itemBloodFrame"); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java index c7ad045e..1a10f2da 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java @@ -1,25 +1,29 @@ package WayofTime.alchemicalWizardry.common.items.forestry; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IHiveFrame; -import java.util.List; - -public class ItemBloodFrame extends EnergyItems //implements IHiveFrame +public class ItemBloodFrame extends EnergyItems implements IHiveFrame { public ItemBloodFrame() { super(); this.maxStackSize = 1; this.setMaxDamage(10); - setEnergyUsed(3000); + setEnergyUsed(1000); setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @@ -48,14 +52,15 @@ public class ItemBloodFrame extends EnergyItems //implements IHiveFrame { if (par1ItemStack.getItemDamage() > 0) { - EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) + { + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + } } } return par1ItemStack; } - /**TODO Bee Stuff @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { // TODO Auto-generated method stub @@ -135,6 +140,6 @@ public class ItemBloodFrame extends EnergyItems //implements IHiveFrame } - */ + }