Getting more spell stuff done

1.7.2/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java

@@ -4,7 +4,6 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -23,27 +22,16 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 import WayofTime.alchemicalWizardry.common.AlchemicalWizardryEventHooks;
 import WayofTime.alchemicalWizardry.common.AlchemicalWizardryFuelHandler;
-import WayofTime.alchemicalWizardry.common.AlchemicalWizardryTickHandler;
 import WayofTime.alchemicalWizardry.common.CommonProxy;
 import WayofTime.alchemicalWizardry.common.EntityAirElemental;
 import WayofTime.alchemicalWizardry.common.LifeBucketHandler;
 import WayofTime.alchemicalWizardry.common.LifeEssence;
 import WayofTime.alchemicalWizardry.common.ModLivingDropsEvent;
 import WayofTime.alchemicalWizardry.common.NewPacketHandler;
-import WayofTime.alchemicalWizardry.common.PacketHandler;
-import WayofTime.alchemicalWizardry.common.PotionBoost;
-import WayofTime.alchemicalWizardry.common.PotionDrowning;
-import WayofTime.alchemicalWizardry.common.PotionFlameCloak;
-import WayofTime.alchemicalWizardry.common.PotionFlight;
-import WayofTime.alchemicalWizardry.common.PotionIceCloak;
-import WayofTime.alchemicalWizardry.common.PotionInhibit;
-import WayofTime.alchemicalWizardry.common.PotionProjectileProtect;
-import WayofTime.alchemicalWizardry.common.PotionReciprocation;
 import WayofTime.alchemicalWizardry.common.alchemy.AlchemicalPotionCreationHandler;
 import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry;
 import WayofTime.alchemicalWizardry.common.altarRecipeRegistry.AltarRecipeRegistry;
 import WayofTime.alchemicalWizardry.common.block.ArmourForge;
-import WayofTime.alchemicalWizardry.common.block.LifeEssenceBlock;
 import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntityBileDemon;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntityBoulderFist;
@@ -58,16 +46,18 @@ import WayofTime.alchemicalWizardry.common.entity.mob.EntityShadeElemental;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntitySmallEarthGolem;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntityWaterElemental;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntityWingedFireDemon;
-import WayofTime.alchemicalWizardry.common.items.ItemBloodRuneBlock;
 import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
-import WayofTime.alchemicalWizardry.common.items.ItemSpellEffectBlock;
-import WayofTime.alchemicalWizardry.common.items.ItemSpellEnhancementBlock;
-import WayofTime.alchemicalWizardry.common.items.ItemSpellModifierBlock;
-import WayofTime.alchemicalWizardry.common.items.ItemSpellParadigmBlock;
-import WayofTime.alchemicalWizardry.common.items.LifeBucket;
-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.potion.PotionBoost;
+import WayofTime.alchemicalWizardry.common.potion.PotionDrowning;
+import WayofTime.alchemicalWizardry.common.potion.PotionFireFuse;
+import WayofTime.alchemicalWizardry.common.potion.PotionFlameCloak;
+import WayofTime.alchemicalWizardry.common.potion.PotionFlight;
+import WayofTime.alchemicalWizardry.common.potion.PotionHeavyHeart;
+import WayofTime.alchemicalWizardry.common.potion.PotionIceCloak;
+import WayofTime.alchemicalWizardry.common.potion.PotionInhibit;
+import WayofTime.alchemicalWizardry.common.potion.PotionProjectileProtect;
+import WayofTime.alchemicalWizardry.common.potion.PotionReciprocation;
 import WayofTime.alchemicalWizardry.common.rituals.Rituals;
 import WayofTime.alchemicalWizardry.common.spell.simple.HomSpellRegistry;
 import WayofTime.alchemicalWizardry.common.spell.simple.SpellEarthBender;
@@ -97,7 +87,6 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock;
 import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
 import WayofTime.alchemicalWizardry.common.tileEntity.gui.GuiHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -109,8 +98,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
 
 @Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v0.8.0")
 //@NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = {"BloodAltar", "particle", "SetLifeEssence", "GetLifeEssence", "Ritual", "GetAltarEssence", "TESocket", "TEWritingTable", "CustomParticle", "SetPlayerVel", "SetPlayerPos", "TEPedestal", "TEPlinth", "TETeleposer", "InfiniteLPPath", "TEOrientor"}, packetHandler = PacketHandler.class)
@@ -135,6 +122,8 @@ public class AlchemicalWizardry
     public static Potion customPotionReciprocation;
     public static Potion customPotionFlameCloak;
     public static Potion customPotionIceCloak;
+    public static Potion customPotionHeavyHeart;
+    public static Potion customPotionFireFuse;
 
     public static int customPotionDrowningID;
     public static int customPotionBoostID;
@@ -144,6 +133,8 @@ public class AlchemicalWizardry
     public static int customPotionReciprocationID;
     public static int customPotionFlameCloakID;
     public static int customPotionIceCloakID;
+    public static int customPotionHeavyHeartID;
+    public static int customPotionFireFuseID;
 
     public static boolean isThaumcraftLoaded;
     public static boolean isForestryLoaded;
@@ -438,6 +429,9 @@ public class AlchemicalWizardry
         customPotionReciprocation = (new PotionReciprocation(customPotionReciprocationID, false, 0xFFFFFF)).setIconIndex(0, 0).setPotionName("Reciprocation");
         customPotionFlameCloak = (new PotionFlameCloak(customPotionFlameCloakID,false,0).setIconIndex(0,0).setPotionName("Flame Cloak"));
         customPotionIceCloak = (new PotionIceCloak(customPotionIceCloakID,false,0).setIconIndex(0,0).setPotionName("Ice Cloak"));
+        customPotionHeavyHeart = (new PotionHeavyHeart(customPotionHeavyHeartID,true,0).setIconIndex(0, 0).setPotionName("Heavy Heart"));
+        customPotionFireFuse = (new PotionFireFuse(customPotionFireFuseID,true,0).setIconIndex(0, 0).setPotionName("Fire Fuse"));
+        
         
         //FluidStack lifeEssenceFluidStack = new FluidStack(lifeEssenceFluid, 1);
         //LiquidStack lifeEssence = new LiquidStack(lifeEssenceFlowing, 1);

1.7.2/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java

@@ -46,6 +46,8 @@ public class BloodMagicConfiguration
             AlchemicalWizardry.customPotionReciprocationID = config.get("Potion ID", "Reciprocation", 105).getInt();
             AlchemicalWizardry.customPotionFlameCloakID = config.get("Potion ID","FlameCloak",106).getInt();
             AlchemicalWizardry.customPotionIceCloakID = config.get("Potion ID","IceCloak",107).getInt();
+            AlchemicalWizardry.customPotionHeavyHeartID = config.get("Potion ID","HeavyHeart",108).getInt();
+            AlchemicalWizardry.customPotionFireFuseID = config.get("Potion ID","FireFuse",109).getInt();
             
             MeteorParadigm.maxChance = config.get("meteor", "maxChance", 1000).getInt();
             AlchemicalWizardry.doMeteorsDestroyBlocks = config.get("meteor", "doMeteorsDestroyBlocks", true).getBoolean(true);

1.7.2/java/WayofTime/alchemicalWizardry/ModBlocks.java

@@ -90,10 +90,6 @@ public class ModBlocks
     	GameRegistry.registerBlock(ModBlocks.blockAltar, "Altar");
     	GameRegistry.registerBlock(ModBlocks.bloodRune, ItemBloodRuneBlock.class, "AlchemicalWizardry" + (ModBlocks.bloodRune.getUnlocalizedName().substring(5)));
         GameRegistry.registerBlock(ModBlocks.blockLifeEssence, "lifeEssence");
-        GameRegistry.registerBlock(ModBlocks.blockSpellParadigm, ItemSpellParadigmBlock.class, "AlchemicalWizardry" + (ModBlocks.blockSpellParadigm.getUnlocalizedName()));
-        GameRegistry.registerBlock(ModBlocks.blockSpellEnhancement, ItemSpellEnhancementBlock.class,"AlchemicalWizardry" + (ModBlocks.blockSpellEnhancement.getUnlocalizedName()));
-        GameRegistry.registerBlock(ModBlocks.blockSpellModifier, ItemSpellModifierBlock.class,"AlchemicalWizardry" + (ModBlocks.blockSpellModifier.getUnlocalizedName()));
-        GameRegistry.registerBlock(ModBlocks.blockSpellEffect, ItemSpellEffectBlock.class,"AlchemicalWizardry" + (ModBlocks.blockSpellEffect.getUnlocalizedName()));
         GameRegistry.registerBlock(ModBlocks.speedRune, "speedRune");
         GameRegistry.registerBlock(ModBlocks.efficiencyRune, "efficiencyRune");
         GameRegistry.registerBlock(ModBlocks.runeOfSacrifice, "runeOfSacrifice");
@@ -114,7 +110,13 @@ public class ModBlocks
         GameRegistry.registerBlock(ModBlocks.blockTeleposer, "blockTeleposer");
         GameRegistry.registerBlock(ModBlocks.spectralBlock, "spectralBlock");
         GameRegistry.registerBlock(ModBlocks.blockBloodLight, "bloodLight");
+        
         GameRegistry.registerBlock(ModBlocks.blockConduit,"blockConduit");
+        GameRegistry.registerBlock(ModBlocks.blockSpellParadigm, ItemSpellParadigmBlock.class, "AlchemicalWizardry" + (ModBlocks.blockSpellParadigm.getUnlocalizedName()));
+        GameRegistry.registerBlock(ModBlocks.blockSpellEnhancement, ItemSpellEnhancementBlock.class,"AlchemicalWizardry" + (ModBlocks.blockSpellEnhancement.getUnlocalizedName()));
+        GameRegistry.registerBlock(ModBlocks.blockSpellModifier, ItemSpellModifierBlock.class,"AlchemicalWizardry" + (ModBlocks.blockSpellModifier.getUnlocalizedName()));
+        GameRegistry.registerBlock(ModBlocks.blockSpellEffect, ItemSpellEffectBlock.class,"AlchemicalWizardry" + (ModBlocks.blockSpellEffect.getUnlocalizedName()));
+        
     }
     
     public static void registerBlocksInInit()

1.7.2/java/WayofTime/alchemicalWizardry/ModItems.java

@@ -1,13 +1,72 @@
 package WayofTime.alchemicalWizardry;
 
-import cpw.mods.fml.common.event.FMLEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-import WayofTime.alchemicalWizardry.common.items.*;
-import WayofTime.alchemicalWizardry.common.items.potion.*;
-import WayofTime.alchemicalWizardry.common.items.sigil.*;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
+import WayofTime.alchemicalWizardry.common.items.AWBaseItems;
+import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
+import WayofTime.alchemicalWizardry.common.items.AirScribeTool;
+import WayofTime.alchemicalWizardry.common.items.ApprenticeBloodOrb;
+import WayofTime.alchemicalWizardry.common.items.ArchmageBloodOrb;
+import WayofTime.alchemicalWizardry.common.items.ArmourInhibitor;
+import WayofTime.alchemicalWizardry.common.items.BlankSpell;
+import WayofTime.alchemicalWizardry.common.items.BloodShard;
+import WayofTime.alchemicalWizardry.common.items.BoundArmour;
+import WayofTime.alchemicalWizardry.common.items.BoundAxe;
+import WayofTime.alchemicalWizardry.common.items.BoundPickaxe;
+import WayofTime.alchemicalWizardry.common.items.BoundShovel;
+import WayofTime.alchemicalWizardry.common.items.CheatyItem;
+import WayofTime.alchemicalWizardry.common.items.DaggerOfSacrifice;
+import WayofTime.alchemicalWizardry.common.items.DemonPlacer;
+import WayofTime.alchemicalWizardry.common.items.DemonicTelepositionFocus;
+import WayofTime.alchemicalWizardry.common.items.DuskScribeTool;
+import WayofTime.alchemicalWizardry.common.items.EarthScribeTool;
+import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
+import WayofTime.alchemicalWizardry.common.items.EnergyBazooka;
+import WayofTime.alchemicalWizardry.common.items.EnergyBlast;
+import WayofTime.alchemicalWizardry.common.items.EnergySword;
+import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus;
+import WayofTime.alchemicalWizardry.common.items.FireScribeTool;
+import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal;
+import WayofTime.alchemicalWizardry.common.items.ItemComponents;
+import WayofTime.alchemicalWizardry.common.items.ItemDiabloKey;
+import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
+import WayofTime.alchemicalWizardry.common.items.LavaCrystal;
+import WayofTime.alchemicalWizardry.common.items.LifeBucket;
+import WayofTime.alchemicalWizardry.common.items.MagicianBloodOrb;
+import WayofTime.alchemicalWizardry.common.items.MasterBloodOrb;
+import WayofTime.alchemicalWizardry.common.items.ReinforcedTelepositionFocus;
+import WayofTime.alchemicalWizardry.common.items.SacrificialDagger;
+import WayofTime.alchemicalWizardry.common.items.TelepositionFocus;
+import WayofTime.alchemicalWizardry.common.items.WaterScribeTool;
+import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask;
+import WayofTime.alchemicalWizardry.common.items.potion.AlchemyReagent;
+import WayofTime.alchemicalWizardry.common.items.potion.AverageLengtheningCatalyst;
+import WayofTime.alchemicalWizardry.common.items.potion.AveragePowerCatalyst;
+import WayofTime.alchemicalWizardry.common.items.potion.EnhancedFillingAgent;
+import WayofTime.alchemicalWizardry.common.items.potion.GreaterLengtheningCatalyst;
+import WayofTime.alchemicalWizardry.common.items.potion.GreaterPowerCatalyst;
+import WayofTime.alchemicalWizardry.common.items.potion.MundaneLengtheningCatalyst;
+import WayofTime.alchemicalWizardry.common.items.potion.MundanePowerCatalyst;
+import WayofTime.alchemicalWizardry.common.items.potion.StandardBindingAgent;
+import WayofTime.alchemicalWizardry.common.items.potion.StandardFillingAgent;
+import WayofTime.alchemicalWizardry.common.items.potion.WeakBindingAgent;
+import WayofTime.alchemicalWizardry.common.items.potion.WeakFillingAgent;
+import WayofTime.alchemicalWizardry.common.items.sigil.AirSigil;
+import WayofTime.alchemicalWizardry.common.items.sigil.DivinationSigil;
+import WayofTime.alchemicalWizardry.common.items.sigil.ItemBloodLightSigil;
+import WayofTime.alchemicalWizardry.common.items.sigil.LavaSigil;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfElementalAffinity;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfGrowth;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHaste;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfMagnetism;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheBridge;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheFastMiner;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfWind;
+import WayofTime.alchemicalWizardry.common.items.sigil.VoidSigil;
+import WayofTime.alchemicalWizardry.common.items.sigil.WaterSigil;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 /**
  * Created with IntelliJ IDEA.
@@ -85,6 +144,8 @@ public class ModItems
     public static Item creativeFiller;
     public static Item demonPlacer;
     
+    public static Item baseItems;
+
     public static Item weakFillingAgent;
     public static Item standardFillingAgent;
     public static Item enhancedFillingAgent;
@@ -182,6 +243,7 @@ public class ModItems
         itemBloodLightSigil = new ItemBloodLightSigil().setUnlocalizedName("bloodLightSigil");
         itemComplexSpellCrystal = new ItemComplexSpellCrystal().setUnlocalizedName("itemComplexSpellCrystal");
         bucketLife = (new LifeBucket(ModBlocks.blockLifeEssence)).setUnlocalizedName("bucketLife").setContainerItem(Items.bucket).setCreativeTab(CreativeTabs.tabMisc);
+        baseItems = new ItemComponents().setUnlocalizedName("baseItems");
     }
     
     public static void registerItems()
@@ -269,6 +331,8 @@ public class ModItems
         GameRegistry.registerItem(ModItems.itemBloodLightSigil, "itemBloodLightSigil");
         GameRegistry.registerItem(ModItems.itemComplexSpellCrystal, "itemComplexSpellCrystal");
         GameRegistry.registerItem(ModItems.bucketLife, "bucketLife");
+        
+        GameRegistry.registerItem(ModItems.baseItems, "bloodMagicBaseItems");
         //GameRegistry.registerItem(ModItems.itemBloodFrame, "itemBloodFrame");
     }
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java

@@ -43,6 +43,11 @@ public class AlchemicalWizardryEventHooks
             int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionBoost).getAmplifier();
             event.entityLiving.motionY += (0.1f) * (2 + i);
         } 
+        
+        if(event.entityLiving.isPotionActive(AlchemicalWizardry.customPotionHeavyHeart))
+        {
+        	event.entityLiving.motionY = 0;
+        }
     }
 
     @SubscribeEvent
@@ -299,5 +304,31 @@ public class AlchemicalWizardryEventHooks
 	        	}
         	}
         } 
+        
+        if(entityLiving.isPotionActive(AlchemicalWizardry.customPotionHeavyHeart))
+        {
+        	entityLiving.worldObj.spawnParticle("flame", x+SpellHelper.gaussian(1),y-1.3+SpellHelper.gaussian(0.3),z+SpellHelper.gaussian(1), 0, 0.06d, 0);
+        	
+            int i = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionHeavyHeart).getAmplifier();
+        	double decrease = 0.025*(i+1);
+        	
+        	if(entityLiving.motionY>-0.5)
+        	{
+        		entityLiving.motionY-=decrease;
+        	}
+        }
+        
+        if(entityLiving.isPotionActive(AlchemicalWizardry.customPotionFireFuse))
+        {
+        	entityLiving.worldObj.spawnParticle("flame", x+SpellHelper.gaussian(1),y-1.3+SpellHelper.gaussian(0.3),z+SpellHelper.gaussian(1), 0, 0.06d, 0);
+
+            int r = event.entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFireFuse).getAmplifier();
+        	int radius = r+1;
+        	
+        	if(entityLiving.getActivePotionEffect(AlchemicalWizardry.customPotionFireFuse).getDuration()<=2)
+        	{
+        		entityLiving.worldObj.createExplosion(null, x, y, z, radius, false);
+        	}
+        } 
     }
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/altarRecipeRegistry/AltarRecipeRegistry.java

@@ -78,7 +78,7 @@ public class AltarRecipeRegistry
 		{
 			if(recipe.doesRequiredItemMatch(testItem, currentTierAltar))
 			{
-				return recipe.getResult();
+				return ItemStack.copyItemStack(recipe.getResult());
 			}
 		}
 		

1.7.2/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java

@@ -142,8 +142,8 @@ public class BoundAxe extends ItemAxe implements IBindable
 
         Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer);
         int posX = (int)(blockVec.xCoord);
-        int posY = (int)(blockVec.xCoord);
+        int posY = (int)(blockVec.yCoord);
-        int posZ = (int)(blockVec.xCoord);
+        int posZ = (int)(blockVec.zCoord);
         boolean silkTouch = false;
         int so = Enchantment.silkTouch.effectId;
         int fortune = Enchantment.fortune.effectId;

1.7.2/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java

@@ -139,8 +139,8 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
         
         Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer);
         int posX = (int)(blockVec.xCoord);
-        int posY = (int)(blockVec.xCoord);
+        int posY = (int)(blockVec.yCoord);
-        int posZ = (int)(blockVec.xCoord);
+        int posZ = (int)(blockVec.zCoord);
         boolean silkTouch = false;
         int so = Enchantment.silkTouch.effectId;
         int fortune = Enchantment.fortune.effectId;

1.7.2/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java

@@ -143,8 +143,8 @@ public class BoundShovel extends ItemSpade implements IBindable
 
         Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer);
         int posX = (int)(blockVec.xCoord);
-        int posY = (int)(blockVec.xCoord);
+        int posY = (int)(blockVec.yCoord);
-        int posZ = (int)(blockVec.xCoord);
+        int posZ = (int)(blockVec.zCoord);
         boolean silkTouch = false;
         int so = Enchantment.silkTouch.effectId;
         int fortune = Enchantment.fortune.effectId;

1.7.2/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java

@@ -0,0 +1,80 @@
+package WayofTime.alchemicalWizardry.common.items;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+import org.lwjgl.input.Keyboard;
+
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ItemComponents extends Item
+{
+    private static final String[] ITEM_NAMES = new String[]{"QuartzRod"};
+
+    @SideOnly(Side.CLIENT)
+    private IIcon[] icons;
+
+    public ItemComponents()
+    {
+        super();
+        this.maxStackSize = 1;
+        this.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
+        this.hasSubtypes = true;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister iconRegister)
+    {
+        icons = new IIcon[ITEM_NAMES.length];
+
+        for (int i = 0; i < ITEM_NAMES.length; ++i)
+        {
+            icons[i] = iconRegister.registerIcon("AlchemicalWizardry:" + "baseItem" + ITEM_NAMES[i]);
+        }
+    }
+
+    @Override
+    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
+    {
+        return par1ItemStack;
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack itemStack)
+    {
+        //This is what will do all the localisation things on the alchemy components so you dont have to set it :D
+        int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1);
+        return ("" + "item.bloodMagicBaseItem." + ITEM_NAMES[meta]);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIconFromDamage(int meta)
+    {
+        int j = MathHelper.clamp_int(meta, 0, ITEM_NAMES.length - 1);
+        return icons[j];
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item id, CreativeTabs creativeTab, List list)
+    {
+        for (int meta = 0; meta < ITEM_NAMES.length; ++meta)
+        {
+            list.add(new ItemStack(id, 1, meta));
+        }
+    }
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionBoost.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionDrowning.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionFireFuse.java

@@ -0,0 +1,18 @@
+package WayofTime.alchemicalWizardry.common.potion;
+
+import net.minecraft.potion.Potion;
+
+public class PotionFireFuse extends Potion
+{
+    public PotionFireFuse(int par1, boolean par2, int par3)
+    {
+        super(par1, par2, par3);
+    }
+
+    @Override
+    public Potion setIconIndex(int par1, int par2)
+    {
+        super.setIconIndex(par1, par2);
+        return this;
+    }
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionFlameCloak.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionFlight.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionHeavyHeart.java

@@ -0,0 +1,18 @@
+package WayofTime.alchemicalWizardry.common.potion;
+
+import net.minecraft.potion.Potion;
+
+public class PotionHeavyHeart extends Potion
+{
+    public PotionHeavyHeart(int par1, boolean par2, int par3)
+    {
+        super(par1, par2, par3);
+    }
+
+    @Override
+    public Potion setIconIndex(int par1, int par2)
+    {
+        super.setIconIndex(par1, par2);
+        return this;
+    }
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionIceCloak.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionInhibit.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionProjectileProtect.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/potion/PotionReciprocation.java

@@ -1,4 +1,4 @@
-package WayofTime.alchemicalWizardry.common;
+package WayofTime.alchemicalWizardry.common.potion;
 
 import net.minecraft.potion.Potion;
 

1.7.2/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEnhancementBlockItemRenderer.java

@@ -95,13 +95,20 @@ public class TESpellEnhancementBlockItemRenderer implements IItemRenderer
 	}
 	
 	public String getResourceLocationForMeta(int meta)
-    {
+	{
 		switch(meta)
 		{
 		case 0: return "alchemicalwizardry:textures/models/SpellEnhancementPower1.png";
 		case 1: return "alchemicalwizardry:textures/models/SpellEnhancementPower2.png";
 		case 2: return "alchemicalwizardry:textures/models/SpellEnhancementPower3.png";
+		case 5: return "alchemicalwizardry:textures/models/SpellEnhancementCost1.png";
+		case 6: return "alchemicalwizardry:textures/models/SpellEnhancementCost2.png";
+		case 7: return "alchemicalwizardry:textures/models/SpellEnhancementCost3.png";
+		case 10: return "alchemicalwizardry:textures/models/SpellEnhancementPotency1.png";
+		case 11: return "alchemicalwizardry:textures/models/SpellEnhancementPotency2.png";
+		case 12: return "alchemicalwizardry:textures/models/SpellEnhancementPotency3.png";
+
 		}
     	return "alchemicalwizardry:textures/models/SpellEnhancementPower1.png";
-    }
+	}
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/EntitySpellProjectile.java

@@ -552,7 +552,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile
 		{
 			for(IProjectileImpactEffect impactEffect : impactList)
 			{
-				impactEffect.onEntityImpact(mop);
+				impactEffect.onEntityImpact(mop, this);
 			}
 		}
 	}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellEffectEarth.java

@@ -3,36 +3,36 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.MeleeDefaultEarth;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileDefaultEarth;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileDefensiveEarth;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileEnvironmentalEarth;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileOffensiveEarth;
 
 public class SpellEffectEarth extends SpellEffect 
 {
 	@Override
 	public void defaultModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addImpactEffect(new ProjectileDefaultEarth(this.powerEnhancement, this.potencyEnhancement, this.costEnhancement));
-
 	}
 
 	@Override
 	public void offensiveModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addImpactEffect(new ProjectileOffensiveEarth(this.powerEnhancement, this.potencyEnhancement, this.costEnhancement));
-
 	}
 
 	@Override
 	public void defensiveModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addImpactEffect(new ProjectileDefensiveEarth(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-
 	}
 
 	@Override
 	public void environmentalModificationProjectile(SpellParadigmProjectile parad)
 	{
 		parad.addUpdateEffect(new ProjectileEnvironmentalEarth(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-
 	}
 
 	@Override
@@ -66,8 +66,7 @@ public class SpellEffectEarth extends SpellEffect
 	@Override
 	public void defaultModificationMelee(SpellParadigmMelee parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addWorldEffect(new MeleeDefaultEarth(this.powerEnhancement, this.potencyEnhancement, this.costEnhancement));
-
 	}
 
 	@Override
@@ -94,28 +93,26 @@ public class SpellEffectEarth extends SpellEffect
 	@Override
 	protected int getCostForDefaultProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(10*Math.pow((0.5*(this.powerEnhancement)+1)*2 + 1,3)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
 	protected int getCostForOffenseProjectile()
 	{
-		// TODO Auto-generated method stub
+		
-		return 0;
+		return (int)(3*(1.5*this.potencyEnhancement+1)*(Math.pow(1*this.powerEnhancement+1,2))*Math.pow(0.8, costEnhancement));
 	}
 
 	@Override
 	protected int getCostForDefenseProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(3*Math.pow((this.powerEnhancement*2+1),2)*(this.potencyEnhancement*2+1)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
 	protected int getCostForEnvironmentProjectile() 
 	{
-		return (int)(10*2*(0.1d*(this.potencyEnhancement+1))*Math.pow(3.47,this.potencyEnhancement));
+		return (int)(10*2*(0.1d*(this.potencyEnhancement+1))*Math.pow(3.47,this.potencyEnhancement)*Math.pow(0.8, costEnhancement));
 	}
 
 	@Override

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellEffectFire.java

@@ -4,6 +4,9 @@ import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileDefaultFire;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileDefensiveFire;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileEnvironmentalFire;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileOffensiveFire;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfDefaultFire;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfDefensiveFire;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfEnvironmentalFire;
@@ -21,25 +24,19 @@ public class SpellEffectFire extends SpellEffect
 	@Override
 	public void offensiveModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addImpactEffect(new ProjectileOffensiveFire(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-		parad.addImpactEffect(new ProjectileDefaultFire(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-		parad.damage+=this.potencyEnhancement;
 	}
 
 	@Override
 	public void defensiveModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addImpactEffect(new ProjectileDefensiveFire(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-		parad.addImpactEffect(new ProjectileDefaultFire(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-		parad.damage+=this.potencyEnhancement;
 	}
 
 	@Override
 	public void environmentalModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addUpdateEffect(new ProjectileEnvironmentalFire(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-		parad.addImpactEffect(new ProjectileDefaultFire(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-		parad.damage+=this.potencyEnhancement;
 	}
 
 	@Override
@@ -97,48 +94,43 @@ public class SpellEffectFire extends SpellEffect
 	@Override
 	protected int getCostForDefaultProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)((5*Math.pow(1.5*this.powerEnhancement+1, 2)*(1.5*this.potencyEnhancement+1)+this.potencyEnhancement*15)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
 	protected int getCostForOffenseProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(10*Math.pow((this.powerEnhancement)*1.3+1,2)*((1.5*this.potencyEnhancement+1))*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
 	protected int getCostForDefenseProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(25*Math.pow(1*this.powerEnhancement+1,2)*(1*this.potencyEnhancement+1)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
 	protected int getCostForEnvironmentProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(75*(0.5*this.powerEnhancement+1)*(0.5*this.potencyEnhancement+1)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
 	protected int getCostForDefaultSelf() 
 	{
-		return 10*(int)(10*Math.pow(1.5, this.powerEnhancement+1.5*this.potencyEnhancement));
+		return 10*(int)(10*Math.pow(1.5, this.powerEnhancement+1.5*this.potencyEnhancement)*Math.pow(0.8, costEnhancement));
 	}
 
 	@Override
 	protected int getCostForOffenseSelf() 
 	{
-		return 500*(int)((this.powerEnhancement+1)*Math.pow(2, potencyEnhancement));
+		return 500*(int)((this.powerEnhancement+1)*Math.pow(2, potencyEnhancement)*Math.pow(0.8, costEnhancement));
 	}
 
 	@Override
 	protected int getCostForDefenseSelf() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(25*(3*this.potencyEnhancement+1)*(2*this.powerEnhancement+1)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
@@ -174,5 +166,4 @@ public class SpellEffectFire extends SpellEffect
 		// TODO Auto-generated method stub
 		return 0;
 	}
-
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellEffectWind.java

@@ -3,36 +3,34 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile;
 import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ProjectileDefaultWind;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ProjectileEnvironmentalWind;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ProjectileOffensiveWind;
 
 public class SpellEffectWind extends SpellEffect 
 {
 	@Override
 	public void defaultModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addImpactEffect(new ProjectileDefaultWind(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-
 	}
 
 	@Override
 	public void offensiveModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.addImpactEffect(new ProjectileOffensiveWind(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-
 	}
 
 	@Override
 	public void defensiveModificationProjectile(SpellParadigmProjectile parad) 
 	{
-		// TODO Auto-generated method stub
+		parad.ricochetMax+=this.potencyEnhancement;
-
 	}
 
 	@Override
 	public void environmentalModificationProjectile(SpellParadigmProjectile parad)
 	{
 		parad.addUpdateEffect(new ProjectileEnvironmentalWind(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement));
-
 	}
 
 	@Override
@@ -94,15 +92,13 @@ public class SpellEffectWind extends SpellEffect
 	@Override
 	protected int getCostForDefaultProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(100*(this.potencyEnhancement+1)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
 	protected int getCostForOffenseProjectile()
 	{
-		// TODO Auto-generated method stub
+		return (int)(100*(0.5*this.potencyEnhancement+1)*(this.powerEnhancement+1)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override
@@ -115,8 +111,7 @@ public class SpellEffectWind extends SpellEffect
 	@Override
 	protected int getCostForEnvironmentProjectile() 
 	{
-		// TODO Auto-generated method stub
+		return (int)(50*(this.powerEnhancement+1)*(this.potencyEnhancement+1)*Math.pow(0.8, costEnhancement));
-		return 0;
 	}
 
 	@Override

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java

@@ -3,8 +3,8 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect;
 import java.util.List;
 import java.util.Random;
 
-import WayofTime.alchemicalWizardry.common.NewPacketHandler;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -15,8 +15,8 @@ import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import net.minecraft.world.WorldProvider;
 import net.minecraftforge.common.util.ForgeDirection;
+import WayofTime.alchemicalWizardry.common.NewPacketHandler;
 
 public class SpellHelper 
 {
@@ -193,4 +193,37 @@ public class SpellHelper
 			NewPacketHandler.INSTANCE.sendTo(NewPacketHandler.getVelSettingPacket(motionX, motionY, motionZ), (EntityPlayerMP) player);
 		}
 	}
+	
+	public static void smashBlock(World world, int posX, int posY, int posZ)
+	{
+		Block block = world.getBlock(posX, posY, posZ);
+		
+		if(block==Blocks.stone)
+		{
+			world.setBlock(posX, posY, posZ, Blocks.cobblestone);
+		}
+		else if(block==Blocks.cobblestone)
+		{
+			world.setBlock(posX, posY, posZ, Blocks.gravel);
+		}
+		else if(block==Blocks.gravel)
+		{
+			world.setBlock(posX, posY, posZ, Blocks.sand);
+		}
+	}
+	
+	public static boolean isBlockFluid(Block block)
+	{
+		return block instanceof BlockLiquid;
+	}
+	
+	public static void evaporateWaterBlock(World world, int posX, int posY, int posZ)
+	{
+		Block block = world.getBlock(posX, posY, posZ);
+		
+		if(block == Blocks.water || block == Blocks.flowing_water)
+		{
+			world.setBlockToAir(posX, posY, posZ);
+		}
+	}
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IProjectileImpactEffect.java

@@ -6,6 +6,6 @@ import net.minecraft.world.World;
 
 public interface IProjectileImpactEffect 
 {
-	public void onEntityImpact(Entity mop);
+	public void onEntityImpact(Entity mop, Entity projectile);
 	public void onTileImpact(World world, MovingObjectPosition mop);
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/MeleeSpellCenteredWorldEffect.java

@@ -0,0 +1,34 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public abstract class MeleeSpellCenteredWorldEffect extends MeleeSpellWorldEffect 
+{
+	protected float range;
+	
+	public MeleeSpellCenteredWorldEffect(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+		range = 0;
+	}
+
+	@Override
+	public void onWorldEffect(World world, EntityPlayer entityPlayer) 
+	{
+		Vec3 lookVec = entityPlayer.getLook(range);
+		int x = (int)(entityPlayer.posX + lookVec.xCoord);
+		int y = (int)(entityPlayer.posY + entityPlayer.getEyeHeight() + lookVec.yCoord);
+		int z = (int)(entityPlayer.posZ + lookVec.zCoord);
+		
+		this.onCenteredWorldEffect(world, x, y, z);
+	}
+
+	public void setRange(float range)
+	{
+		this.range = range;
+	}
+	
+	public abstract void onCenteredWorldEffect(World world, int posX, int posY, int posZ);
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefaultEarth.java

@@ -0,0 +1,38 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.item.EntityFallingBlock;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellCenteredWorldEffect;
+
+public class MeleeDefaultEarth extends MeleeSpellCenteredWorldEffect
+{
+	public MeleeDefaultEarth(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+		this.setRange(2);
+	}
+
+	@Override
+	public void onCenteredWorldEffect(World world, int posX, int posY, int posZ) 
+	{
+		for(int i=-3; i<=3; i++)
+		{
+			for(int j=-3; j<=3; j++)
+			{
+				for(int k=-3; k<=3; k++)
+				{
+					if(!world.isAirBlock(posX + i, posY + j, posZ + k) && world.getTileEntity(posX + i, posY + j, posZ + k)==null)
+					{
+						Block block = world.getBlock(posX + i, posY + j, posZ + k);
+						int meta = world.getBlockMetadata(posX + i, posY + j, posZ + k);
+						
+						EntityFallingBlock entity = new EntityFallingBlock(world, posX + i + 0.5f, posY + j + 0.5f, posZ + k + 0.5f, block, meta);
+						world.spawnEntityInWorld(entity);
+					}
+				}
+			}
+		}
+		
+	}
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefaultEarth.java

@@ -0,0 +1,58 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.BlockFluidBase;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
+
+public class ProjectileDefaultEarth extends ProjectileImpactEffect 
+{
+	public ProjectileDefaultEarth(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onEntityImpact(Entity mop, Entity proj) 
+	{
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{		
+		int horizRange = (int)(0.5*(this.powerUpgrades)+1);
+		int vertRange = (int)(0.5*(this.powerUpgrades)+1);
+		
+		int posX = mop.blockX;
+		int posY = mop.blockY;
+		int posZ = mop.blockZ;
+		
+		for(int i=-horizRange; i<=horizRange; i++)
+		{
+			for(int j=-vertRange; j<=vertRange; j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(!world.isAirBlock(posX+i, posY+j, posZ+k))
+					{
+						Block block = world.getBlock(posX+i, posY+j, posZ+k);
+						if(block == null || block.getBlockHardness(world, posX+i, posY+j, posZ+k)==-1 || SpellHelper.isBlockFluid(block))
+						{
+							continue;
+						}
+						//block.breakBlock(world, posX+i, posY+j, posZ+k, block.blockID, world.getBlockMetadata(posX+i, posY+j, posZ+k));
+						//world.destroyBlock(posX+i, posY+j, posZ+k, true);
+						world.func_147480_a(posX+i, posY+j, posZ+k, false);
+					}
+				}
+			}
+		}
+
+	}
+
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefensiveEarth.java

@@ -0,0 +1,66 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth;
+
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect;
+
+public class ProjectileDefensiveEarth extends ProjectileImpactEffect 
+{
+	public ProjectileDefensiveEarth(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onEntityImpact(Entity mop, Entity proj) 
+	{
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{		
+		int horizRange = (int)(this.powerUpgrades);
+		int vertRange = (int)(this.potencyUpgrades);
+		
+		int posX = mop.blockX;
+		int posY = mop.blockY;
+		int posZ = mop.blockZ;
+		
+		for(int i=-horizRange; i<=horizRange; i++)
+		{
+			for(int j=-vertRange; j<=vertRange; j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(!world.isAirBlock(posX+i, posY+j, posZ+k))
+					{
+						Block block = world.getBlock(posX+i, posY+j, posZ+k);
+						if(block == null || block.getBlockHardness(world, posX+i, posY+j, posZ+k)==-1)
+						{
+							continue;
+						}
+						//block.breakBlock(world, posX+i, posY+j, posZ+k, block.blockID, world.getBlockMetadata(posX+i, posY+j, posZ+k));
+						//world.destroyBlock(posX+i, posY+j, posZ+k, true);
+						if(world.rand.nextFloat()<0.6f)
+						{
+							SpellHelper.smashBlock(world, posX+i, posY+j, posZ+k);
+						}
+					}
+				}
+			}
+		}
+
+	}
+
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileEnvironmentalEarth.java

@@ -52,7 +52,7 @@ public class ProjectileEnvironmentalEarth extends ProjectileUpdateEffect
 						if(!worldObj.isAirBlock(posX+i, posY+j, posZ+k)&&blocksBroken<maxBlocks)
 						{
 							Block block = worldObj.getBlock(posX+i, posY+j, posZ+k);
-							if(block == null || block.getBlockHardness(worldObj, posX+i, posY+j, posZ+k)==-1)
+							if(block == null || block.getBlockHardness(worldObj, posX+i, posY+j, posZ+k)==-1 || SpellHelper.isBlockFluid(block))
 							{
 								continue;
 							}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileOffensiveEarth.java

@@ -0,0 +1,98 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth;
+
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect;
+
+public class ProjectileOffensiveEarth extends ProjectileImpactEffect 
+{
+	public ProjectileOffensiveEarth(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onEntityImpact(Entity mop, Entity proj) 
+	{
+		int horizRange = (int)(this.powerUpgrades);
+		int vertDepth = (int)(3*this.potencyUpgrades+1);
+		
+		Vec3 blockVector = SpellHelper.getEntityBlockVector(mop);
+		
+		int posX = (int)(blockVector.xCoord);
+		int posY = (int)(blockVector.yCoord);
+		int posZ = (int)(blockVector.zCoord);
+		
+		World world = mop.worldObj;
+		
+		for(int i=-horizRange; i<=horizRange; i++)
+		{
+			for(int j=-vertDepth; j<0; j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(!world.isAirBlock(posX+i, posY+j, posZ+k))
+					{
+						Block block = world.getBlock(posX+i, posY+j, posZ+k);
+						if(block == null || block.getBlockHardness(world, posX+i, posY+j, posZ+k)==-1)
+						{
+							continue;
+						}
+						//block.breakBlock(world, posX+i, posY+j, posZ+k, block.blockID, world.getBlockMetadata(posX+i, posY+j, posZ+k));
+						//world.destroyBlock(posX+i, posY+j, posZ+k, true);
+						if(block == Blocks.stone || block == Blocks.cobblestone || block == Blocks.sand || block == Blocks.gravel || block == Blocks.grass || block == Blocks.dirt)
+						{
+							world.setBlockToAir(posX+i, posY+j, posZ+k);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{		
+//		int horizRange = (int)(this.powerUpgrades);
+//		int vertRange = (int)(this.potencyUpgrades);
+//		
+//		int posX = mop.blockX;
+//		int posY = mop.blockY;
+//		int posZ = mop.blockZ;
+//		
+//		for(int i=-horizRange; i<=horizRange; i++)
+//		{
+//			for(int j=-vertRange; j<=vertRange; j++)
+//			{
+//				for(int k=-horizRange; k<=horizRange; k++)
+//				{
+//					if(!world.isAirBlock(posX+i, posY+j, posZ+k))
+//					{
+//						Block block = world.getBlock(posX+i, posY+j, posZ+k);
+//						if(block == null || block.getBlockHardness(world, posX+i, posY+j, posZ+k)==-1)
+//						{
+//							continue;
+//						}
+//						//block.breakBlock(world, posX+i, posY+j, posZ+k, block.blockID, world.getBlockMetadata(posX+i, posY+j, posZ+k));
+//						//world.destroyBlock(posX+i, posY+j, posZ+k, true);
+//						if(world.rand.nextFloat()<0.6f)
+//						{
+//							SpellHelper.smashBlock(world, posX+i, posY+j, posZ+k);
+//						}
+//					}
+//				}
+//			}
+//		}
+	}
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefaultFire.java

@@ -3,7 +3,9 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.f
 import net.minecraft.entity.Entity;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
 
 public class ProjectileDefaultFire extends ProjectileImpactEffect
@@ -14,23 +16,23 @@ public class ProjectileDefaultFire extends ProjectileImpactEffect
 	}
 
 	@Override
-	public void onEntityImpact(Entity mop) 
+	public void onEntityImpact(Entity mop, Entity proj) 
 	{		
-		mop.setFire((int)Math.pow(2,this.powerUpgrades));
+		Vec3 blockVec = SpellHelper.getEntityBlockVector(mop);
-	}
 		
-	@Override
+		int x = (int)(blockVec.xCoord);
-	public void onTileImpact(World world, MovingObjectPosition mop) 
+		int y = (int)(blockVec.yCoord);
-	{
+		int z = (int)(blockVec.zCoord);
-		int x = mop.blockX;
+		World world = mop.worldObj;
-		int y = mop.blockY;
+		
-		int z = mop.blockZ;
+		int horizRange = 0;
-		int range = 0;
+		int vertRange = 0;
-		for(int i=-range; i<=range;i++)
+		
+		for(int i=-horizRange; i<=horizRange;i++)
 		{
-			for(int j=-range; j<=range;j++)
+			for(int j=-vertRange; j<=vertRange;j++)
 			{
-				for(int k=-range; k<=range; k++)
+				for(int k=-horizRange; k<=horizRange; k++)
 				{
 					if(world.isAirBlock(x+i, y+j, z+k))
 					{
@@ -39,6 +41,30 @@ public class ProjectileDefaultFire extends ProjectileImpactEffect
 				}
 			}
 		}
+	}
 
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{
+		int x = mop.blockX;
+		int y = mop.blockY;
+		int z = mop.blockZ;
+		
+		int horizRange = 0;
+		int vertRange = 0;
+		
+		for(int i=-horizRange; i<=horizRange;i++)
+		{
+			for(int j=-vertRange; j<=vertRange;j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(world.isAirBlock(x+i, y+j, z+k))
+					{
+						world.setBlock(x+i, y+j, z+k, Blocks.fire);
+					}
+				}
+			}
+		}
 	}
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefensiveFire.java

@@ -0,0 +1,47 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
+
+public class ProjectileDefensiveFire extends ProjectileImpactEffect
+{
+	public ProjectileDefensiveFire(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onEntityImpact(Entity mop, Entity proj) 
+	{
+		mop.setFire(3*(this.potencyUpgrades+1));
+	}
+
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{
+		int horizRange = (int)((this.powerUpgrades));
+		int vertRange = (int)((this.powerUpgrades));
+		
+		int posX = mop.blockX;
+		int posY = mop.blockY;
+		int posZ = mop.blockZ;
+		
+		for(int i=-horizRange; i<=horizRange; i++)
+		{
+			for(int j=-vertRange; j<=vertRange; j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(!world.isAirBlock(posX+i, posY+j, posZ+k))
+					{
+						SpellHelper.smeltBlockInWorld(world, posX+i, posY+j, posZ+k);
+					}
+				}
+			}
+		}
+	}
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileEnvironmentalFire.java

@@ -0,0 +1,46 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect;
+
+public class ProjectileEnvironmentalFire extends ProjectileUpdateEffect 
+{
+	public ProjectileEnvironmentalFire(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onUpdateEffect(Entity projectile) 
+	{
+		Vec3 posVec = SpellHelper.getEntityBlockVector(projectile);
+		
+		int horizRange = this.powerUpgrades+1;
+		int vertRange = (int)(0.5*(this.powerUpgrades+1));
+		
+		int posX = (int)(posVec.xCoord);
+		int posY = (int)(posVec.yCoord);
+		int posZ = (int)(posVec.zCoord);
+		
+		World worldObj = projectile.worldObj;
+					
+		for(int i=-horizRange; i<=horizRange; i++)
+		{
+			for(int j=-vertRange; j<=vertRange; j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(!worldObj.isAirBlock(posX+i, posY+j, posZ+k))
+					{
+						SpellHelper.evaporateWaterBlock(worldObj, posX + i, posY + j, posZ + k);
+					}
+				}
+			}
+		}
+	}
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileOffensiveFire.java

@@ -0,0 +1,88 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire;
+
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect;
+
+public class ProjectileOffensiveFire extends ProjectileImpactEffect 
+{
+	public ProjectileOffensiveFire(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onEntityImpact(Entity mop, Entity proj) 
+	{
+		int horizRange = (int)(this.powerUpgrades);
+		int vertDepth = (int)(3*this.potencyUpgrades+1);
+		
+		Vec3 blockVector = SpellHelper.getEntityBlockVector(mop);
+		
+		int posX = (int)(blockVector.xCoord);
+		int posY = (int)(blockVector.yCoord);
+		int posZ = (int)(blockVector.zCoord);
+		
+		World world = mop.worldObj;
+		
+		for(int i=-horizRange; i<=horizRange; i++)
+		{
+			for(int j=-vertDepth; j<0; j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(world.isAirBlock(posX+i, posY+j, posZ+k))
+					{
+						world.setBlock(posX + i, posY + j,  posZ + k, Blocks.flowing_lava,7,3);
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{		
+//		int horizRange = (int)(this.powerUpgrades);
+//		int vertRange = (int)(this.potencyUpgrades);
+//		
+//		int posX = mop.blockX;
+//		int posY = mop.blockY;
+//		int posZ = mop.blockZ;
+//		
+//		for(int i=-horizRange; i<=horizRange; i++)
+//		{
+//			for(int j=-vertRange; j<=vertRange; j++)
+//			{
+//				for(int k=-horizRange; k<=horizRange; k++)
+//				{
+//					if(!world.isAirBlock(posX+i, posY+j, posZ+k))
+//					{
+//						Block block = world.getBlock(posX+i, posY+j, posZ+k);
+//						if(block == null || block.getBlockHardness(world, posX+i, posY+j, posZ+k)==-1)
+//						{
+//							continue;
+//						}
+//						//block.breakBlock(world, posX+i, posY+j, posZ+k, block.blockID, world.getBlockMetadata(posX+i, posY+j, posZ+k));
+//						//world.destroyBlock(posX+i, posY+j, posZ+k, true);
+//						if(world.rand.nextFloat()<0.6f)
+//						{
+//							SpellHelper.smashBlock(world, posX+i, posY+j, posZ+k);
+//						}
+//					}
+//				}
+//			}
+//		}
+	}
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefensiveFire.java

@@ -1,7 +1,10 @@
 package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect;
 
 public class SelfDefensiveFire extends SelfSpellEffect {
@@ -14,11 +17,27 @@ public class SelfDefensiveFire extends SelfSpellEffect {
 	@Override
 	public void onSelfUse(World world, EntityPlayer player) 
 	{
-		// TODO Auto-generated method stub
+		int horizRange = (int)(this.powerUpgrades);
+		int vertDepth = (int)(3*this.potencyUpgrades+1);
 		
-        world.playAuxSFXAtEntity(player, 1008,  (int)player.posX,  (int)player.posY,  (int)player.posZ, 0);
+		Vec3 blockVector = SpellHelper.getEntityBlockVector(player);
 		
+		int posX = (int)(blockVector.xCoord);
+		int posY = (int)(blockVector.yCoord);
+		int posZ = (int)(blockVector.zCoord);
 
+		for(int i=-horizRange; i<=horizRange; i++)
+		{
+			for(int j=-vertDepth; j<0; j++)
+			{
+				for(int k=-horizRange; k<=horizRange; k++)
+				{
+					if(world.isAirBlock(posX+i, posY+j, posZ+k))
+					{
+						world.setBlock(posX + i, posY + j,  posZ + k, Blocks.flowing_lava,7,3);
+					}
+				}
+			}
+		}
 	}
-
 }

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefaultIce.java

@@ -15,7 +15,7 @@ public class ProjectileDefaultIce extends ProjectileImpactEffect
 	}
 
 	@Override
-	public void onEntityImpact(Entity mop) 
+	public void onEntityImpact(Entity mop, Entity proj) 
 	{
 		return;
 	}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefensiveIce.java

@@ -16,7 +16,7 @@ public class ProjectileDefensiveIce extends ProjectileImpactEffect
 	}
 
 	@Override
-	public void onEntityImpact(Entity mop) 
+	public void onEntityImpact(Entity mop, Entity proj) 
 	{
 		return;
 	}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileOffensiveIce.java

@@ -16,7 +16,7 @@ public class ProjectileOffensiveIce extends ProjectileImpactEffect
 	}
 
 	@Override
-	public void onEntityImpact(Entity mop) 
+	public void onEntityImpact(Entity mop, Entity proj) 
 	{
 		if(mop instanceof EntityLivingBase)
 		{

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileDefaultWind.java

@@ -0,0 +1,33 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
+
+public class ProjectileDefaultWind extends ProjectileImpactEffect
+{
+	public ProjectileDefaultWind(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onEntityImpact(Entity mop, Entity proj) 
+	{
+		float wantedYVel = (float)((0.5)*(0.5*this.potencyUpgrades + 1));
+		
+		mop.motionX = proj.motionX;
+		mop.motionY = mop.motionY += wantedYVel;
+		mop.motionZ = proj.motionZ;
+	}
+
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{
+		return;
+	}
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileOffensiveWind.java

@@ -0,0 +1,33 @@
+package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect;
+
+public class ProjectileOffensiveWind extends ProjectileImpactEffect
+{
+
+	public ProjectileOffensiveWind(int power, int potency, int cost) 
+	{
+		super(power, potency, cost);
+	}
+
+	@Override
+	public void onEntityImpact(Entity mop, Entity proj) 
+	{
+		if(mop instanceof EntityLiving)
+		{
+			((EntityLiving) mop).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionHeavyHeart.id,(int)(100*(2*this.powerUpgrades+1)*(1/(this.potencyUpgrades+1))),this.potencyUpgrades));
+		}
+	}
+
+	@Override
+	public void onTileImpact(World world, MovingObjectPosition mop) 
+	{
+		return;
+	}
+}

1.7.2/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java

@@ -484,6 +484,10 @@ public class TEPlinth extends TileEntity implements IInventory
                             if (itemStack.getItem()== possibleItem.getItem() && (itemStack.getItemDamage() == possibleItem.getItemDamage() || itemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE))
                             {
                                 ((TEPedestal) tileEntity).decrStackSize(0, 1);
+                                if(((TEPedestal) tileEntity).getStackInSlot(0) !=null && ((TEPedestal) tileEntity).getStackInSlot(0).stackSize==0)
+                                {
+                                	((TEPedestal) tileEntity).setInventorySlotContents(0, null);
+                                }
                                 ((TEPedestal) tileEntity).onItemDeletion();
                                 worldObj.markBlockForUpdate(xCoord + pc.xOffset, yCoord + pc.yOffset, zCoord + pc.zOffset);
                                 return true;

1.7.2/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellEnhancementBlock.java

@@ -108,6 +108,12 @@ public class TESpellEnhancementBlock extends TESpellBlock
 		case 0: return "alchemicalwizardry:textures/models/SpellEnhancementPower1.png";
 		case 1: return "alchemicalwizardry:textures/models/SpellEnhancementPower2.png";
 		case 2: return "alchemicalwizardry:textures/models/SpellEnhancementPower3.png";
+		case 5: return "alchemicalwizardry:textures/models/SpellEnhancementCost1.png";
+		case 6: return "alchemicalwizardry:textures/models/SpellEnhancementCost2.png";
+		case 7: return "alchemicalwizardry:textures/models/SpellEnhancementCost3.png";
+		case 10: return "alchemicalwizardry:textures/models/SpellEnhancementPotency1.png";
+		case 11: return "alchemicalwizardry:textures/models/SpellEnhancementPotency2.png";
+		case 12: return "alchemicalwizardry:textures/models/SpellEnhancementPotency3.png";
 
 		}
     	return "alchemicalwizardry:textures/models/SpellEnhancementPower1.png";

1.7.2/java/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java

@@ -679,16 +679,16 @@ public class TEWritingTable extends TileEntity implements IInventory
 
             if (getStackInSlot(6) == null)
             {
-                if (worldTime % 4 == 0)
-                {
-                    SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord);
-                }
-
                 if (!EnergyItems.syphonWhileInContainer(getStackInSlot(0), amountUsed))
                 {
                     return;
                 }
                 
+                if (worldTime % 4 == 0)
+                {
+                    SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord);
+                }
+
                 progress++;
 
                 if (progress >= progressNeeded)

BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java

@@ -946,14 +946,14 @@ public class AlchemicalWizardry
         {
         	this.isForestryLoaded = true;
         	
-        	ModItems.itemBloodFrame = new ItemBloodFrame(this.itemBloodFrameItemID).setUnlocalizedName("bloodFrame");
+//        	ModItems.itemBloodFrame = new ItemBloodFrame(this.itemBloodFrameItemID).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
         {
         	this.isForestryLoaded = false;

BM_src/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java

@@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -95,6 +96,12 @@ public class ActivationCrystal extends EnergyItems
     public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
+        
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         return par1ItemStack;
     }
 

BM_src/WayofTime/alchemicalWizardry/common/items/BlankSpell.java

@@ -1,6 +1,7 @@
 package WayofTime.alchemicalWizardry.common.items;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -54,6 +55,11 @@ public class BlankSpell extends EnergyItems
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             return par1ItemStack;

BM_src/WayofTime/alchemicalWizardry/common/items/BoundArmour.java

@@ -1,11 +1,7 @@
 package WayofTime.alchemicalWizardry.common.items;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import java.util.List;
-import WayofTime.alchemicalWizardry.ModItems;
+
-import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
-import WayofTime.alchemicalWizardry.common.IBindable;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -22,9 +18,16 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 import thaumcraft.api.IGoggles;
 import thaumcraft.api.nodes.IRevealer;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
+import WayofTime.alchemicalWizardry.common.IBindable;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.Optional.Interface;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
-import java.util.List;
+@Optional.InterfaceList(value = {@Interface(iface="IRevealer", modid = "Thaumcraft"), @Interface(iface="IGoggles", modid = "Thaumcraft")})
-
 public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer, IGoggles, IBindable
 {
     private static int invSize = 9;

BM_src/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java

@@ -1,6 +1,7 @@
 package WayofTime.alchemicalWizardry.common.items;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 
 import com.google.common.collect.Multimap;
@@ -55,11 +56,19 @@ public class DaggerOfSacrifice extends EnergyItems
     @Override
     public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase)
     {
-        if (par3EntityLivingBase == null || par2EntityLivingBase == null || par3EntityLivingBase.worldObj.isRemote || !(par3EntityLivingBase.getClass().equals(EntityPlayerMP.class)))
+        if (par3EntityLivingBase == null || par2EntityLivingBase == null || par3EntityLivingBase.worldObj.isRemote)
         {
             return false;
         }
         
+        if(par3EntityLivingBase instanceof EntityPlayer)
+        {
+        	if(SpellHelper.isFakePlayer(par3EntityLivingBase.worldObj, (EntityPlayer)par3EntityLivingBase))
+            {
+            	return false;
+            }
+        }
+
         //EntityWither d;
         if (par2EntityLivingBase.isChild() || par2EntityLivingBase instanceof EntityWither || par2EntityLivingBase instanceof EntityDragon || par2EntityLivingBase instanceof EntityPlayer || par2EntityLivingBase instanceof IBossDisplayData)
         {

BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java

@@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.*;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.relauncher.Side;
@@ -68,9 +69,9 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
         World world = par3EntityPlayer.worldObj;
 
-        if (par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP)
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
         {
-            return par1ItemStack;
+        	return par1ItemStack;
         }
 
         if (world != null)

BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java

@@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -68,6 +69,11 @@ public class EnergyBazooka extends EnergyItems
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             this.setActivated(par1ItemStack, !getActivated(par1ItemStack));

BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java

@@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -68,6 +69,11 @@ public class EnergyBlast extends EnergyItems
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             this.setActivated(par1ItemStack, !getActivated(par1ItemStack));

BM_src/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java

@@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.common.IBindable;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.relauncher.Side;
@@ -59,9 +60,9 @@ public class ItemDiabloKey extends EnergyItems
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
         World world = par3EntityPlayer.worldObj;
 
-        if (par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP)
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
         {
-            return par1ItemStack;
+        	return par1ItemStack;
         }
         
         if (world != null)

BM_src/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java

@@ -5,6 +5,7 @@ import WayofTime.alchemicalWizardry.ModBlocks;
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.common.rituals.RitualComponent;
 import WayofTime.alchemicalWizardry.common.rituals.Rituals;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -125,6 +126,12 @@ public class ItemRitualDiviner extends EnergyItems
     public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer);
+        
+        if(SpellHelper.isFakePlayer(par2EntityPlayer.worldObj, par2EntityPlayer))
+        {
+        	return false;
+        }
+        
         ItemStack[] playerInventory = par2EntityPlayer.inventory.mainInventory;
         TileEntity tileEntity = par3World.getBlockTileEntity(par4, par5, par6);
 

BM_src/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java

@@ -1,6 +1,7 @@
 package WayofTime.alchemicalWizardry.common.items;
 
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -46,9 +47,9 @@ public class SacrificialDagger extends Item
             par3EntityPlayer.setHealth(par3EntityPlayer.getHealth() - 2);
         }
 
-        if (par3EntityPlayer instanceof FakePlayer)
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
         {
-            return par1ItemStack;
+        	return par1ItemStack;
         }
 
         double posX = par3EntityPlayer.posX;

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java

@@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -49,6 +50,11 @@ public class AirSigil extends EnergyItems implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             return par1ItemStack;

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java

@@ -4,6 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.PacketHandler;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -52,6 +53,11 @@ public class DivinationSigil extends Item implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (!par3EntityPlayer.worldObj.isRemote)
         {
             return par1ItemStack;

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java

@@ -4,6 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.ModBlocks;
 import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -51,6 +52,12 @@ public class ItemBloodLightSigil extends EnergyItems
     public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer);
+        
+        if(SpellHelper.isFakePlayer(par2EntityPlayer.worldObj, par2EntityPlayer))
+        {
+        	return false;
+        }
+        
         EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
 
         if (par3World.isRemote)

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java

@@ -4,6 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -72,6 +73,11 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             return par1ItemStack;

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java

@@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.*;
@@ -103,6 +104,11 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2EntityPlayer.worldObj, par2EntityPlayer))
+        {
+        	return false;
+        }
+        
         if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer))
         {
             EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
@@ -162,6 +168,11 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
             return;
         }
         
+        if(SpellHelper.isFakePlayer(par3Entity.worldObj, (EntityPlayer)par3Entity))
+        {
+        	return;
+        }
+
         EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
 
         if (par1ItemStack.stackTagCompound == null)

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java

@@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -97,6 +98,11 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             return par1ItemStack;
@@ -141,6 +147,11 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
             return;
         }
 
+        if(SpellHelper.isFakePlayer(par2World,(EntityPlayer) par3Entity))
+        {
+        	return;
+        }
+        
         EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
 
         if (par1ItemStack.stackTagCompound == null)

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java

@@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -116,6 +117,11 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             return par1ItemStack;
@@ -154,6 +160,11 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
             return;
         }
         
+        if(SpellHelper.isFakePlayer(par2World, (EntityPlayer)par3Entity))
+        {
+        	return;
+        }
+
         EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
 
         if (par1ItemStack.stackTagCompound == null)

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java

@@ -4,6 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.MaterialLiquid;
@@ -145,6 +146,11 @@ public class VoidSigil extends ItemBucket implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             return par1ItemStack;

BM_src/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java

@@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -79,6 +80,11 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
     {
         EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
 
+        if(SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        {
+        	return par1ItemStack;
+        }
+        
         if (par3EntityPlayer.isSneaking())
         {
             return par1ItemStack;

BM_src/WayofTime/alchemicalWizardry/common/rituals/Rituals.java

@@ -900,7 +900,7 @@ public class Rituals
         ritualList.add(new Rituals(biomeChangerRitual, 2, 1000000, new RitualEffectBiomeChanger(), "Ritual of Gaia's Transformation"));
         ritualList.add(new Rituals(flightRitual, 2, 1000000, new RitualEffectFlight(), "Reverence of the Condor"));
         ritualList.add(new Rituals(meteorRitual, 2, 1000000, new RitualEffectSummonMeteor(), "Mark of the Falling Tower"));
-        ritualList.add(new Rituals(apiaryRitual,1,100,new RitualEffectApiaryOverclock(),"Apiary Overclock"));
+        //ritualList.add(new Rituals(apiaryRitual,1,100,new RitualEffectApiaryOverclock(),"Apiary Overclock"));
     }
 
     public static int getCostForActivation(int ritualID)

BM_src/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java

@@ -5,12 +5,15 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import net.minecraftforge.common.FakePlayer;
 import net.minecraftforge.common.ForgeDirection;
 
 public class SpellHelper 
@@ -105,4 +108,30 @@ public class SpellHelper
 			world.setBlock(posX, posY, posZ, Block.ice.blockID);
 		}
 	}
+	
+	public static boolean isFakePlayer(World world, EntityPlayer player)
+	{
+		if(world.isRemote)
+		{
+			return false;
+		}
+		
+		if(player instanceof FakePlayer)
+		{
+			return true;
+		}
+		
+		String str = player.getClass().getCanonicalName();
+		if(str.contains("GCEntityPlayerMP"))
+		{
+			return false;
+		}
+		
+		if(player.getClass().equals(EntityPlayerMP.class))
+		{
+			return false;
+		}
+		
+		return true;
+	}
 }