lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Readded the Blood Frame

Browse source
This commit is contained in:
WayofTime 2015-05-11 13:28:01 -04:00
parent 2cc9d3a53a
commit c36f752612
4 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,5 +1,5 @@
# #
#Fri May 08 12:08:25 EDT 2015 #Mon May 11 13:18:11 EDT 2015
mod_name=BloodMagic mod_name=BloodMagic
forge_version=10.13.3.1374-1.7.10 forge_version=10.13.3.1374-1.7.10
ccc_version=1.0.4.29 ccc_version=1.0.4.29
@ -9,5 +9,5 @@ guideapi_version=1.0-14
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=1.3.2aBeta mod_version=1.3.2aBeta
minetweaker_version=Dev-1.7.10-3.0.9B minetweaker_version=Dev-1.7.10-3.0.9B
build_number=8
mc_version=1.7.10 mc_version=1.7.10
build_number=7

17
src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
View file

@ -113,6 +113,7 @@ import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler;
import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry; import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry;
import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour; 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.sigil.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour; import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour;
import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth;
@ -1190,14 +1191,14 @@ public class AlchemicalWizardry
{ {
this.isForestryLoaded = true; this.isForestryLoaded = true;
// ModItems.itemBloodFrame = new ItemBloodFrame(this.itemBloodFrameItemID).setUnlocalizedName("bloodFrame"); ModItems.itemBloodFrame = new ItemBloodFrame().setUnlocalizedName("bloodFrame");
//
// ItemStack provenFrame = GameRegistry.findItemStack("Forestry", "frameImpregnated", 1); ItemStack provenFrame = GameRegistry.findItemStack("Forestry", "frameImpregnated", 1);
//
// if(provenFrame !=null) if(provenFrame !=null)
// { {
// AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.itemBloodFrame), provenFrame, 3, 30000, 20, 20, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.itemBloodFrame), provenFrame, 3, 30000, 20, 20, false);
// } }
} else } else
{ {
this.isForestryLoaded = false; this.isForestryLoaded = false;

1
src/main/java/WayofTime/alchemicalWizardry/ModItems.java
View file

@ -511,6 +511,5 @@ public class ModItems
GameRegistry.registerItem(ModItems.itemMailCatalogue, "itemMailCatalogue"); GameRegistry.registerItem(ModItems.itemMailCatalogue, "itemMailCatalogue");
GameRegistry.registerItem(ModItems.itemIncense, "bloodMagicIncenseItem"); GameRegistry.registerItem(ModItems.itemIncense, "bloodMagicIncenseItem");
//GameRegistry.registerItem(ModItems.itemBloodFrame, "itemBloodFrame");
} }
} }

29
src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java
View file

@ -1,25 +1,29 @@
package WayofTime.alchemicalWizardry.common.items.forestry; package WayofTime.alchemicalWizardry.common.items.forestry;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import java.util.List;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; 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() public ItemBloodFrame()
{ {
super(); super();
this.maxStackSize = 1; this.maxStackSize = 1;
this.setMaxDamage(10); this.setMaxDamage(10);
setEnergyUsed(3000); setEnergyUsed(1000);
setCreativeTab(AlchemicalWizardry.tabBloodMagic); setCreativeTab(AlchemicalWizardry.tabBloodMagic);
} }
@ -48,14 +52,15 @@ public class ItemBloodFrame extends EnergyItems //implements IHiveFrame
{ {
if (par1ItemStack.getItemDamage() > 0) if (par1ItemStack.getItemDamage() > 0)
{ {
EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); {
par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
}
} }
} }
return par1ItemStack; return par1ItemStack;
} }
/**TODO Bee Stuff
@Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
@ -135,6 +140,6 @@ public class ItemBloodFrame extends EnergyItems //implements IHiveFrame
} }
*/
} }