Anti-comments sweep!

1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java

@@ -1,14 +1,45 @@
 package WayofTime.alchemicalWizardry;
 
-import java.io.File;
+import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler;
-import java.io.FileOutputStream;
+import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
-import java.io.InputStream;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
-import java.lang.reflect.Field;
+import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
-import java.lang.reflect.Modifier;
+import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
-import java.util.List;
+import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
-import java.util.zip.ZipEntry;
+import WayofTime.alchemicalWizardry.api.rituals.Rituals;
-import java.util.zip.ZipInputStream;
+import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry;
-
+import WayofTime.alchemicalWizardry.common.*;
+import WayofTime.alchemicalWizardry.common.alchemy.CombinedPotionRegistry;
+import WayofTime.alchemicalWizardry.common.block.ArmourForge;
+import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
+import WayofTime.alchemicalWizardry.common.entity.mob.*;
+import WayofTime.alchemicalWizardry.common.harvest.BloodMagicHarvestHandler;
+import WayofTime.alchemicalWizardry.common.harvest.CactusReedHarvestHandler;
+import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler;
+import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry;
+import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
+import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour;
+import WayofTime.alchemicalWizardry.common.potion.*;
+import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer;
+import WayofTime.alchemicalWizardry.common.rituals.*;
+import WayofTime.alchemicalWizardry.common.spell.simple.*;
+import WayofTime.alchemicalWizardry.common.summoning.SummoningHelperAW;
+import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
+import WayofTime.alchemicalWizardry.common.tileEntity.*;
+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;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+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 joshie.alchemicalWizardy.ShapedBloodOrbRecipe;
 import joshie.alchemicalWizardy.ShapelessBloodOrbRecipe;
 import net.minecraft.creativetab.CreativeTabs;
@@ -34,140 +65,17 @@ import thaumcraft.api.ItemApi;
 import thaumcraft.api.ThaumcraftApi;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
-import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler;
+
-import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
+import java.io.File;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
+import java.io.FileOutputStream;
-import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
+import java.io.InputStream;
-import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
+import java.lang.reflect.Field;
-import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
+import java.lang.reflect.Modifier;
-import WayofTime.alchemicalWizardry.api.rituals.Rituals;
+import java.util.List;
-import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry;
+import java.util.zip.ZipEntry;
-import WayofTime.alchemicalWizardry.common.AlchemicalWizardryEventHooks;
+import java.util.zip.ZipInputStream;
-import WayofTime.alchemicalWizardry.common.AlchemicalWizardryFuelHandler;
-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.alchemy.CombinedPotionRegistry;
-import WayofTime.alchemicalWizardry.common.block.ArmourForge;
-import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityBileDemon;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityBoulderFist;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityEarthElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityFallenAngel;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityFireElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityHolyElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityIceDemon;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityLowerGuardian;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityShade;
-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.harvest.BloodMagicHarvestHandler;
-import WayofTime.alchemicalWizardry.common.harvest.CactusReedHarvestHandler;
-import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler;
-import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry;
-import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
-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.PotionDeaf;
-import WayofTime.alchemicalWizardry.common.potion.PotionDrowning;
-import WayofTime.alchemicalWizardry.common.potion.PotionFeatherFall;
-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.PotionPlanarBinding;
-import WayofTime.alchemicalWizardry.common.potion.PotionProjectileProtect;
-import WayofTime.alchemicalWizardry.common.potion.PotionReciprocation;
-import WayofTime.alchemicalWizardry.common.potion.PotionSoulFray;
-import WayofTime.alchemicalWizardry.common.potion.PotionSoulHarden;
-import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAnimalGrowth;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAutoAlchemy;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectBiomeChanger;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectContainment;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectCrushing;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectEllipsoid;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectEvaporation;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectExpulsion;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFeatheredEarth;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFeatheredKnife;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFlight;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectFullStomach;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectGrowth;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectHarvest;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectHealing;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectInterdiction;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectItemSuction;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectJumping;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLava;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLeap;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectLifeConduit;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectMagnetic;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSoulBound;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSpawnWard;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSummonMeteor;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectSupression;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectUnbinding;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectVeilOfEvil;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWater;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWellOfSuffering;
-import WayofTime.alchemicalWizardry.common.spell.simple.HomSpellRegistry;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellEarthBender;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellExplosions;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellFireBurst;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellFrozenWater;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellHolyBlast;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellLightningBolt;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellWateryGrave;
-import WayofTime.alchemicalWizardry.common.spell.simple.SpellWindGust;
-import WayofTime.alchemicalWizardry.common.summoning.SummoningHelperAW;
-import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEDemonPortal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEOrientable;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESchematicSaver;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEnhancementBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock;
-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;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-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;
 
 @Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.2.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)
 
 public class AlchemicalWizardry
 {
@@ -318,10 +226,8 @@ public class AlchemicalWizardry
                         extractCount++;
                     }
                 }
-    		}
+            } catch (Exception e)
-    		catch(Exception e)
             {
-    			
             }
         }
 
@@ -331,8 +237,6 @@ public class AlchemicalWizardry
         BloodMagicConfiguration.init(new File(event.getModConfigurationDirectory(), "AWWayofTime.cfg"));
 
         //Custom config stuff goes here
-
-
         Potion[] potionTypes = null;
 
         for (Field f : Potion.class.getDeclaredFields())
@@ -361,12 +265,8 @@ public class AlchemicalWizardry
         FluidRegistry.registerFluid(lifeEssenceFluid);
 
         ModBlocks.init();
-        
-       
         ModBlocks.registerBlocksInPre();
-        
         ModItems.init();
-        
         ModItems.registerItems();
 
         RecipeSorter.INSTANCE.register("AWWayofTime:shapedorb", ShapedBloodOrbRecipe.class, Category.SHAPED, "before:minecraft:shapeless");
@@ -382,7 +282,6 @@ public class AlchemicalWizardry
     public void load(FMLInitializationEvent event)
     {
         int craftingConstant = OreDictionary.WILDCARD_VALUE;
-        //TickRegistry.registerTickHandler(new AlchemicalWizardryTickHandler(), Side.SERVER);
 
         ModBlocks.registerBlocksInInit();
         //blocks
@@ -391,6 +290,7 @@ public class AlchemicalWizardry
         proxy.registerEntities();
         proxy.registerEntityTrackers();
         proxy.registerEvents();
+
         //ItemStacks used for crafting go here
         ItemStack lapisStack = new ItemStack(Items.dye, 1, 4);
         ItemStack lavaBucketStack = new ItemStack(Items.lava_bucket);
@@ -423,9 +323,7 @@ public class AlchemicalWizardry
         ItemStack saplingStack = new ItemStack(Blocks.sapling);
         ItemStack reedStack = new ItemStack(Items.reeds);
         ItemStack blankSlateStack = new ItemStack(ModItems.blankSlate, 1, craftingConstant);
-        //ItemStack glassShardStack = new ItemStack(glassShard);
         ItemStack weakBloodOrbStackCrafted = new ItemStack(ModItems.weakBloodOrb);
-        //ItemStack bloodiedShardStack = new ItemStack(bloodiedShard);
         ItemStack reinforcedSlateStack = new ItemStack(ModItems.reinforcedSlate, 1, craftingConstant);
         ItemStack weakBloodOrbStack = new ItemStack(ModItems.weakBloodOrb, 1, craftingConstant);
         ItemStack imbuedSlateStack = new ItemStack(ModItems.imbuedSlate, 1, craftingConstant);
@@ -451,10 +349,6 @@ public class AlchemicalWizardry
         ItemStack miningSigilStackCrafted = new ItemStack(ModItems.sigilOfTheFastMiner);
         ItemStack divinationSigilStackCrafted = new ItemStack(ModItems.divinationSigil);
         ItemStack seerSigilStackCrafted = new ItemStack(ModItems.itemSeerSigil);
-//        ItemStack elementalInkWaterStack = new ItemStack(elementalInkWater);
-//        ItemStack elementalInkFireStack = new ItemStack(elementalInkFire);
-//        ItemStack elementalInkEarthStack = new ItemStack(elementalInkEarth);
-//        ItemStack elementalInkAirStack = new ItemStack(elementalInkAir);
         ItemStack waterScribeToolStack = new ItemStack(ModItems.waterScribeTool);
         ItemStack fireScribeToolStack = new ItemStack(ModItems.fireScribeTool);
         ItemStack earthScribeToolStack = new ItemStack(ModItems.earthScribeTool);
@@ -481,7 +375,6 @@ public class AlchemicalWizardry
         ItemStack simpleCatalystStack = new ItemStack(ModItems.simpleCatalyst);
         ItemStack duskRitualDivinerStack = new ItemStack(ModItems.itemRitualDiviner);
         ((ItemRitualDiviner) duskRitualDivinerStack.getItem()).setMaxRuneDisplacement(duskRitualDivinerStack, 1);
-        //weakBloodOrbStackCrafted.setItemDamage(weakBloodOrbStackCrafted.getMaxDamage());
         waterSigilStackCrafted.setItemDamage(waterSigilStackCrafted.getMaxDamage());
         lavaSigilStackCrafted.setItemDamage(lavaSigilStackCrafted.getMaxDamage());
         voidSigilStackCrafted.setItemDamage(voidSigilStackCrafted.getMaxDamage());
@@ -499,22 +392,14 @@ public class AlchemicalWizardry
         ItemStack crepitousStack = new ItemStack(ModItems.crepitous);
         ItemStack magicalesStack = new ItemStack(ModItems.magicales);
         //All crafting goes here
-        // GameRegistry.addRecipe(orbOfTestingStack, "x x", "   ", "x x", 'x', cobblestoneStack);
-        //GameRegistry.addRecipe(glassShardStack, " x", "y ", 'x', ironIngotStack, 'y', glassStack);
-        //GameRegistry.addRecipe(weakBloodOrbStackCrafted, "xxx", "xdx", "www", 'x', bloodiedShardStack, 'd', diamondStack, 'w', woolStack);
         GameRegistry.addRecipe(sacrificialDaggerStack, "ggg", " dg", "i g", 'g', glassStack, 'd', goldIngotStack, 'i', ironIngotStack);
-        //GameRegistry.addRecipe(blankSlateStack, "sgs", "gig", "sgs", 's', stoneStack, 'g', goldNuggetStack, 'i', ironIngotStack);
-        //GameRegistry.addRecipe(reinforcedSlateStack, "rir", "ibi", "gig", 'r', redstoneStack, 'i', ironIngotStack, 'b', blankSlateStack, 'g', glowstoneBlockStack);
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(lavaCrystalStackCrafted, "glg", "lbl", "odo", 'g', glassStack, 'l', lavaBucketStack, 'b', weakBloodOrbStack, 'd', diamondStack, 'o', obsidianStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(waterSigilStackCrafted, "www", "wbw", "wow", 'w', waterBucketStack, 'b', blankSlateStack, 'o', weakBloodOrbStack));
         GameRegistry.addRecipe(lavaSigilStackCrafted, "lml", "lbl", "lcl", 'l', lavaBucketStack, 'b', blankSlateStack, 'm', magmaCreamStack, 'c', lavaCrystalStack);
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(voidSigilStackCrafted, "ese", "ere", "eoe", 'e', emptyBucketStack, 'r', reinforcedSlateStack, 'o', apprenticeBloodOrbStack, 's', stringStack));
         GameRegistry.addRecipe(bloodAltarStack, "s s", "scs", "gdg", 's', stoneStack, 'c', furnaceStack, 'd', diamondStack, 'g', goldIngotStack);
-        //GameRegistry.addRecipe(energySwordStack, " o ", " o ", " s ", 'o', weakBloodOrbStack, 's', diamondSwordStack);
-        //GameRegistry.addRecipe(energyBlasterStack, "oi ", "gdi", " rd", 'o', weakBloodOrbStack, 'i', ironIngotStack, 'd', diamondStack, 'r', reinforcedSlateStack, 'g', goldIngotStack);
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(bloodRuneCraftedStack, "sss", "ror", "sss", 's', stoneStack, 'o', weakBloodOrbStack, 'r', blankSlateStack));
         GameRegistry.addRecipe(speedRuneStack, "sbs", "uru", "sbs", 'u', sugarStack, 's', stoneStack, 'r', bloodRuneStack, 'b', blankSlateStack);
-        //GameRegistry.addRecipe(efficiencyRuneStack, "sbs", "rur", "sbs", 'r', redstoneStack, 's', stoneStack, 'u', bloodRuneStack,'b',blankSlateStack);
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 1), "sbs", "bob", "srs", 's', stoneStack, 'o', magicianBloodOrbStack, 'b', emptyBucketStack, 'r', new ItemStack(ModItems.imbuedSlate)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 2), "sbs", "bob", "srs", 's', stoneStack, 'o', magicianBloodOrbStack, 'b', waterBucketStack, 'r', new ItemStack(ModItems.imbuedSlate)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 3), "sws", "ror", "sws", 's', stoneStack, 'o', new ItemStack(ModItems.masterBloodOrb), 'w', weakBloodOrbStack, 'r', new ItemStack(ModItems.demonicSlate)));
@@ -525,11 +410,6 @@ public class AlchemicalWizardry
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(runeOfSelfSacrificeStack, "srs", "gog", "srs", 's', stoneStack, 'g', glowstoneDustStack, 'o', apprenticeBloodOrbStack, 'r', reinforcedSlateStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(divinationSigilStackCrafted, "ggg", "gsg", "gog", 'g', glassStack, 's', blankSlateStack, 'o', weakBloodOrbStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(seerSigilStackCrafted, "gbg", "gsg", "gog", 'g', glassStack, 's', divinationSigilStackCrafted, 'o', apprenticeBloodOrbStack, 'b', new ItemStack(ModItems.bucketLife)));
-
-//        GameRegistry.addRecipe(waterScribeToolStack, "f", "i", 'f', featherStack, 'i', elementalInkWaterStack);
-//        GameRegistry.addRecipe(fireScribeToolStack, "f", "i", 'f', featherStack, 'i', elementalInkFireStack);
-//        GameRegistry.addRecipe(earthScribeToolStack, "f", "i", 'f', featherStack, 'i', elementalInkEarthStack);
-//        GameRegistry.addRecipe(airScribeToolStack, "f", "i", 'f', featherStack, 'i', elementalInkAirStack);
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(ritualStoneStackCrafted, "srs", "ror", "srs", 's', obsidianStack, 'o', apprenticeBloodOrbStack, 'r', reinforcedSlateStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(masterRitualStoneStack, "brb", "ror", "brb", 'b', obsidianStack, 'o', magicianBloodOrbStack, 'r', ritualStoneStack));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(imperfectRitualStoneStack, "bsb", "sos", "bsb", 's', stoneStack, 'b', obsidianStack, 'o', weakBloodOrbStack));
@@ -580,20 +460,10 @@ public class AlchemicalWizardry
 
         ItemStack masterBloodOrbStack = new ItemStack(ModItems.masterBloodOrb);
 
-        //FluidStack lifeEssenceFluidStack = new FluidStack(lifeEssenceFluid, 1);
-        //LiquidStack lifeEssence = new LiquidStack(lifeEssenceFlowing, 1);
-        //LiquidDictionary.getOrCreateLiquid("Life Essence", lifeEssence);
-        
-
 //        ModBlocks.blockLifeEssence.setUnlocalizedName("lifeEssenceBlock");
         FluidContainerRegistry.registerFluidContainer(lifeEssenceFluid, new ItemStack(ModItems.bucketLife), FluidContainerRegistry.EMPTY_BUCKET);
-        
-        //lifeEssenceFluid.setUnlocalizedName("lifeEssence");
-        //LiquidContainerRegistry.registerLiquid(new LiquidContainerData(LiquidDictionary.getLiquid("Life Essence", LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(AlchemicalWizardry.bucketLife), new ItemStack(Items.bucketEmpty)));
-        //GameRegistry.registerBlock(testingBlock, "testingBlock");
-        //LanguageRegistry.addName(testingBlock, "Testing Block");
-        //(testingBlock, "pickaxe", 0);
         ModBlocks.blockAltar.setHarvestLevel("pickaxe", 1);
+
         //Register Tile Entity
         GameRegistry.registerTileEntity(TEAltar.class, "containerAltar");
         GameRegistry.registerTileEntity(TEMasterStone.class, "containerMasterStone");
@@ -616,7 +486,6 @@ public class AlchemicalWizardry
         GameRegistry.registerTileEntity(TEReagentConduit.class, "containerReagentConduit");
         GameRegistry.registerTileEntity(TEBellJar.class, "containerBellJar");
         GameRegistry.registerTileEntity(TEAlchemicCalcinator.class, "containerAlchemicCalcinator");
-        //GameRegistry.registerBlock(ModBlocks.blockSpellEffect,"blockSpellEffect");
         ModBlocks.bloodRune.setHarvestLevel("pickaxe", 2);
         ModBlocks.speedRune.setHarvestLevel("pickaxe", 2);
         ModBlocks.efficiencyRune.setHarvestLevel("pickaxe", 2);
@@ -635,12 +504,11 @@ public class AlchemicalWizardry
         ModBlocks.blockPedestal.setHarvestLevel("pickaxe", 2);
         ModBlocks.blockPlinth.setHarvestLevel("pickaxe", 2);
         ModBlocks.blockTeleposer.setHarvestLevel("pickaxe", 2);
+
         //Fuel handler
         GameRegistry.registerFuelHandler(new AlchemicalWizardryFuelHandler());
-        //EntityRegistry.registerModEntity(EnergyBlastProjectile.class, "BlasterProj", 0, this, 128, 5, true);
 
         //Gui registration
-        // NetworkRegistry.instance().registerGuiHandler(this, new GuiHandlerAltar());
         UpgradedAltars.loadAltars();
         SigilOfHolding.initiateSigilOfHolding();
         ArmourForge.initializeRecipes();
@@ -654,21 +522,11 @@ public class AlchemicalWizardry
         this.initCombinedAlchemyPotionRecipes();
         ReagentRegistry.initReagents();
 
-        //MinecraftForge.setToolClass(ModItems.boundPickaxe, "pickaxe", 5);
-        //MinecraftForge.setToolClass(ModItems.boundAxe, "axe", 5);
-        //MinecraftForge.setToolClass(ModItems.boundShovel, "shovel", 5);
         MinecraftForge.EVENT_BUS.register(new ModLivingDropsEvent());
         proxy.InitRendering();
         NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
-//        ItemStack[] comp = new ItemStack[5];
-//        for(int i=0;i<5;i++)
-//        {
-//        	comp[i] = redstoneStack;
-//        }
-//        AlchemyRecipeRegistry.registerRecipe(glowstoneDustStack, 2, comp, 2);
 
         ItemStack gunpowderStack = new ItemStack(Items.gunpowder);
-        
         ItemStack offensaStack = new ItemStack(ModItems.baseAlchemyItems, 1, 0);
         ItemStack praesidiumStack = new ItemStack(ModItems.baseAlchemyItems, 1, 1);
         ItemStack orbisTerraeStack = new ItemStack(ModItems.baseAlchemyItems, 1, 2);
@@ -744,6 +602,7 @@ public class AlchemicalWizardry
         SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityFireElementalID), new ItemStack[]{incendiumStack, incendiumStack, incendiumStack, incendiumStack, incendiumStack, incendiumStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
         SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityShadeElementalID), new ItemStack[]{tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack, tennebraeStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
         SummoningRegistry.registerSummon(new SummoningHelperAW(this.entityHolyElementalID), new ItemStack[]{sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack, sanctusStack}, new ItemStack[]{}, new ItemStack[]{}, 0, 4);
+
         //Custom mobs
         EntityRegistry.registerModEntity(EntityFallenAngel.class, "FallenAngel", this.entityFallenAngelID, this, 80, 3, true);
         EntityRegistry.registerModEntity(EntityLowerGuardian.class, "LowerGuardian", this.entityLowerGuardianID, this, 80, 3, true);
@@ -759,7 +618,7 @@ public class AlchemicalWizardry
         EntityRegistry.registerModEntity(EntityFireElemental.class, "FireElemental", this.entityFireElementalID, this, 120, 3, true);
         EntityRegistry.registerModEntity(EntityShadeElemental.class, "ShadeElemental", this.entityShadeElementalID, this, 120, 3, true);
         EntityRegistry.registerModEntity(EntityHolyElemental.class, "HolyElemental", this.entityHolyElementalID, this, 120, 3, true);
-        //EntityRegistry.addSpawn(EntityFallenAngel.class, 5, 1, 5, EnumCreatureType.creature, BiomeGenBase.biomeList);
+
         ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.standardBindingAgent), 1, 3, this.standardBindingAgentDungeonChance));
         ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.mundanePowerCatalyst), 1, 1, this.mundanePowerCatalystDungeonChance));
         ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.mundaneLengtheningCatalyst), 1, 1, this.mundaneLengtheningCatalystDungeonChance));
@@ -767,6 +626,7 @@ public class AlchemicalWizardry
         ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.averageLengtheningCatalyst), 1, 1, this.averageLengtheningCatalystDungeonChance));
         ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.greaterPowerCatalyst), 1, 1, this.greaterPowerCatalystDungeonChance));
         ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.greaterLengtheningCatalyst), 1, 1, this.greaterLengtheningCatalystDungeonChance));
+
         //Ore Dictionary Registration
         OreDictionary.registerOre("oreCoal", Blocks.coal_ore);
         MeteorRegistry.registerMeteorParadigm(diamondStack, diamondMeteorArray, diamondMeteorRadius);
@@ -934,7 +794,6 @@ public class AlchemicalWizardry
                 ThaumcraftApi.registerObjectTag(new ItemStack(ModItems.sanguineBoots), aspectList);
 
 
-                
                 if (itemGoggles != null)
                 {
                     BindingRegistry.registerRecipe(new ItemStack(ModItems.sanguineHelmet), itemGoggles);

1.7.10/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java

@@ -1,20 +1,20 @@
 package WayofTime.alchemicalWizardry;
 
+import WayofTime.alchemicalWizardry.client.renderer.ColourThreshold;
+import WayofTime.alchemicalWizardry.client.renderer.RenderHelper;
+import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraftforge.common.config.Configuration;
+
 import java.io.File;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 
-import net.minecraft.entity.EntityList;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraftforge.common.config.Configuration;
-import WayofTime.alchemicalWizardry.client.renderer.ColourThreshold;
-import WayofTime.alchemicalWizardry.client.renderer.RenderHelper;
-import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
-
 /**
  * Created with IntelliJ IDEA.
  * User: Pokefenn

1.7.10/main/java/WayofTime/alchemicalWizardry/ModBlocks.java

@@ -1,46 +1,9 @@
 package WayofTime.alchemicalWizardry;
 
-import net.minecraft.block.Block;
+import WayofTime.alchemicalWizardry.common.block.*;
-import WayofTime.alchemicalWizardry.common.block.ArmourForge;
+import WayofTime.alchemicalWizardry.common.items.*;
-import WayofTime.alchemicalWizardry.common.block.BlockAlchemicCalcinator;
-import WayofTime.alchemicalWizardry.common.block.BlockAltar;
-import WayofTime.alchemicalWizardry.common.block.BlockBelljar;
-import WayofTime.alchemicalWizardry.common.block.BlockBloodLightSource;
-import WayofTime.alchemicalWizardry.common.block.BlockConduit;
-import WayofTime.alchemicalWizardry.common.block.BlockDemonPortal;
-import WayofTime.alchemicalWizardry.common.block.BlockHomHeart;
-import WayofTime.alchemicalWizardry.common.block.BlockMasterStone;
-import WayofTime.alchemicalWizardry.common.block.BlockPedestal;
-import WayofTime.alchemicalWizardry.common.block.BlockPlinth;
-import WayofTime.alchemicalWizardry.common.block.BlockReagentConduit;
-import WayofTime.alchemicalWizardry.common.block.BlockSchematicSaver;
-import WayofTime.alchemicalWizardry.common.block.BlockSocket;
-import WayofTime.alchemicalWizardry.common.block.BlockSpectralContainer;
-import WayofTime.alchemicalWizardry.common.block.BlockSpellEffect;
-import WayofTime.alchemicalWizardry.common.block.BlockSpellEnhancement;
-import WayofTime.alchemicalWizardry.common.block.BlockSpellModifier;
-import WayofTime.alchemicalWizardry.common.block.BlockSpellParadigm;
-import WayofTime.alchemicalWizardry.common.block.BlockTeleposer;
-import WayofTime.alchemicalWizardry.common.block.BlockWritingTable;
-import WayofTime.alchemicalWizardry.common.block.BloodRune;
-import WayofTime.alchemicalWizardry.common.block.BloodStoneBrick;
-import WayofTime.alchemicalWizardry.common.block.EfficiencyRune;
-import WayofTime.alchemicalWizardry.common.block.EmptySocket;
-import WayofTime.alchemicalWizardry.common.block.ImperfectRitualStone;
-import WayofTime.alchemicalWizardry.common.block.LargeBloodStoneBrick;
-import WayofTime.alchemicalWizardry.common.block.LifeEssenceBlock;
-import WayofTime.alchemicalWizardry.common.block.RitualStone;
-import WayofTime.alchemicalWizardry.common.block.RuneOfSacrifice;
-import WayofTime.alchemicalWizardry.common.block.RuneOfSelfSacrifice;
-import WayofTime.alchemicalWizardry.common.block.SpectralBlock;
-import WayofTime.alchemicalWizardry.common.block.SpeedRune;
-import WayofTime.alchemicalWizardry.common.items.ItemBlockCrystalBelljar;
-import WayofTime.alchemicalWizardry.common.items.ItemBloodRuneBlock;
-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 cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
 
 /**
  * Created with IntelliJ IDEA.
@@ -54,8 +17,6 @@ public class ModBlocks
     public static Block testingBlock;
     public static Block bloodStoneBrick;
     public static Block largeBloodStoneBrick;
-    //    public static Block lifeEssenceStill;
-//    public static Block lifeEssenceFlowing;
     public static BlockAltar blockAltar;
     public static BloodRune bloodRune;
     public static SpeedRune speedRune;
@@ -96,7 +57,6 @@ public class ModBlocks
         efficiencyRune = new EfficiencyRune();
         runeOfSacrifice = new RuneOfSacrifice();
         runeOfSelfSacrifice = new RuneOfSelfSacrifice();
-        
         blockTeleposer = new BlockTeleposer();
         spectralBlock = new SpectralBlock();
         ritualStone = new RitualStone();
@@ -169,6 +129,5 @@ public class ModBlocks
 
     public static void registerBlocksInInit()
     {
-        //GameRegistry.registerBlock(ModBlocks.blockLifeEssence, "lifeEssence");
     }
 }

1.7.10/main/java/WayofTime/alchemicalWizardry/ModItems.java

@@ -1,82 +1,16 @@
 package WayofTime.alchemicalWizardry;
 
-import net.minecraft.creativetab.CreativeTabs;
+import WayofTime.alchemicalWizardry.common.items.*;
-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.ItemAlchemyBase;
-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.energy.ItemAttunedCrystal;
 import WayofTime.alchemicalWizardry.common.items.energy.ItemDestinationClearer;
 import WayofTime.alchemicalWizardry.common.items.energy.ItemTankSegmenter;
-import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask;
+import WayofTime.alchemicalWizardry.common.items.potion.*;
-import WayofTime.alchemicalWizardry.common.items.potion.AlchemyReagent;
+import WayofTime.alchemicalWizardry.common.items.sigil.*;
-import WayofTime.alchemicalWizardry.common.items.potion.AverageLengtheningCatalyst;
-import WayofTime.alchemicalWizardry.common.items.potion.AveragePowerCatalyst;
-import WayofTime.alchemicalWizardry.common.items.potion.CombinationalCatalyst;
-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.ItemFluidSigil;
-import WayofTime.alchemicalWizardry.common.items.sigil.ItemSeerSigil;
-import WayofTime.alchemicalWizardry.common.items.sigil.ItemSigilOfEnderSeverance;
-import WayofTime.alchemicalWizardry.common.items.sigil.ItemSigilOfSupression;
-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 WayofTime.alchemicalWizardry.common.items.spell.ItemSpellMultiTool;
 import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
 
 /**
  * Created with IntelliJ IDEA.

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/AlchemicalPotionCreationHandler.java

@@ -1,9 +1,9 @@
 package WayofTime.alchemicalWizardry.api.alchemy;
 
-import java.util.ArrayList;
-
 import net.minecraft.item.ItemStack;
 
+import java.util.ArrayList;
+
 public class AlchemicalPotionCreationHandler
 {
     public static ArrayList<AlchemyPotionHandlerComponent> registeredPotionEffects = new ArrayList();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipeRegistry.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.api.alchemy;
 
+import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
+import net.minecraft.item.ItemStack;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.item.ItemStack;
-import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
-
 public class AlchemyRecipeRegistry
 {
     public static List<AlchemyRecipe> recipes = new ArrayList();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/IReagentContainer.java

@@ -1,7 +1,5 @@
 package WayofTime.alchemicalWizardry.api.alchemy.energy;
 
-import net.minecraftforge.fluids.FluidTankInfo;
-
 public interface IReagentContainer
 {
     public ReagentStack getReagent();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/Reagent.java

@@ -1,7 +1,5 @@
 package WayofTime.alchemicalWizardry.api.alchemy.energy;
 
-import net.minecraft.item.ItemStack;
-
 public class Reagent
 {
     public final String name;

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ReagentContainer.java

@@ -1,10 +1,6 @@
 package WayofTime.alchemicalWizardry.api.alchemy.energy;
 
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTank;
 
 public class ReagentContainer implements IReagentContainer
 {
@@ -115,8 +111,7 @@ public class ReagentContainer implements IReagentContainer
         {
             reagentStack.amount += resource.amount;
             filled = resource.amount;
-        }
+        } else
-        else
         {
             reagentStack.amount = capacity;
         }

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ReagentContainerInfo.java

@@ -1,8 +1,5 @@
 package WayofTime.alchemicalWizardry.api.alchemy.energy;
 
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidTank;
-
 public final class ReagentContainerInfo
 {
     public final ReagentStack reagent;

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ReagentRegistry.java

@@ -1,13 +1,13 @@
 package WayofTime.alchemicalWizardry.api.alchemy.energy;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import net.minecraft.item.ItemStack;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import net.minecraft.item.ItemStack;
-import WayofTime.alchemicalWizardry.ModItems;
-
 public class ReagentRegistry
 {
     public static Map<String, Reagent> reagentList = new HashMap();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/ReagentStack.java

@@ -1,7 +1,6 @@
 package WayofTime.alchemicalWizardry.api.alchemy.energy;
 
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
 
 public class ReagentStack
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/TileReagentHandler.java

@@ -4,8 +4,6 @@ package WayofTime.alchemicalWizardry.api.alchemy.energy;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.IFluidHandler;
 
 public class TileReagentHandler extends TileEntity implements IReagentHandler
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/api/alchemy/energy/TileSegmentedReagentHandler.java

@@ -1,16 +1,16 @@
 
 package WayofTime.alchemicalWizardry.api.alchemy.energy;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
 public class TileSegmentedReagentHandler extends TileEntity implements ISegmentedReagentHandler
 {
     protected ReagentContainer[] tanks;

1.7.10/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java

@@ -1,10 +1,10 @@
 package WayofTime.alchemicalWizardry.api.altarRecipeRegistry;
 
+import net.minecraft.item.ItemStack;
+
 import java.util.LinkedList;
 import java.util.List;
 
-import net.minecraft.item.ItemStack;
-
 public class AltarRecipeRegistry
 {
     public static List<AltarRecipe> altarRecipes = new LinkedList();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/bindingRegistry/BindingRegistry.java

@@ -1,10 +1,10 @@
 package WayofTime.alchemicalWizardry.api.bindingRegistry;
 
+import net.minecraft.item.ItemStack;
+
 import java.util.LinkedList;
 import java.util.List;
 
-import net.minecraft.item.ItemStack;
-
 public class BindingRegistry
 {
     public static List<BindingRecipe> bindingRecipes = new LinkedList();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/harvest/HarvestRegistry.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.api.harvest;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class HarvestRegistry
 {
     public static List<IHarvestHandler> handlerList = new ArrayList();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/harvest/IHarvestHandler.java

@@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.harvest;
 
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
-import net.minecraftforge.common.IPlantable;
 
 public interface IHarvestHandler
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/api/items/ShapedBloodOrbRecipe.java

@@ -1,11 +1,6 @@
 package WayofTime.alchemicalWizardry.api.items;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import net.minecraft.block.Block;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -14,10 +9,18 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapedRecipes;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
-import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
 
-/** Shaped Blood Orb Recipe Handler by joshie **/
+import java.util.ArrayList;
-public class ShapedBloodOrbRecipe implements IRecipe {		
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * Shaped Blood Orb Recipe Handler by joshie *
+ */
+public class ShapedBloodOrbRecipe implements IRecipe
+{
     private static final int MAX_CRAFT_GRID_WIDTH = 3;
     private static final int MAX_CRAFT_GRID_HEIGHT = 3;
 
@@ -27,40 +30,50 @@ public class ShapedBloodOrbRecipe implements IRecipe {
     public int height = 0;
     private boolean mirrored = true;
 
-	public ShapedBloodOrbRecipe(Block result, Object... recipe) {
+    public ShapedBloodOrbRecipe(Block result, Object... recipe)
+    {
         this(new ItemStack(result), recipe);
     }
 
-	public ShapedBloodOrbRecipe(Item result, Object... recipe) {
+    public ShapedBloodOrbRecipe(Item result, Object... recipe)
+    {
         this(new ItemStack(result), recipe);
     }
 
-	public ShapedBloodOrbRecipe(ItemStack result, Object... recipe) {
+    public ShapedBloodOrbRecipe(ItemStack result, Object... recipe)
+    {
         output = result.copy();
 
         String shape = "";
         int idx = 0;
 
-		if (recipe[idx] instanceof Boolean) {
+        if (recipe[idx] instanceof Boolean)
+        {
             mirrored = (Boolean) recipe[idx];
-			if (recipe[idx + 1] instanceof Object[]) {
+            if (recipe[idx + 1] instanceof Object[])
+            {
                 recipe = (Object[]) recipe[idx + 1];
-			} else {
+            } else
+            {
                 idx = 1;
             }
         }
 
-		if (recipe[idx] instanceof String[]) {
+        if (recipe[idx] instanceof String[])
+        {
             String[] parts = ((String[]) recipe[idx++]);
 
-			for (String s : parts) {
+            for (String s : parts)
+            {
                 width = s.length();
                 shape += s;
             }
 
             height = parts.length;
-		} else {
+        } else
-			while (recipe[idx] instanceof String) {
+        {
+            while (recipe[idx] instanceof String)
+            {
                 String s = (String) recipe[idx++];
                 shape += s;
                 width = s.length();
@@ -68,9 +81,11 @@ public class ShapedBloodOrbRecipe implements IRecipe {
             }
         }
 
-		if (width * height != shape.length()) {
+        if (width * height != shape.length())
+        {
             String ret = "Invalid shaped ore recipe: ";
-			for (Object tmp : recipe) {
+            for (Object tmp : recipe)
+            {
                 ret += tmp + ", ";
             }
             ret += output;
@@ -79,24 +94,33 @@ public class ShapedBloodOrbRecipe implements IRecipe {
 
         HashMap<Character, Object> itemMap = new HashMap<Character, Object>();
 
-		for (; idx < recipe.length; idx += 2) {
+        for (; idx < recipe.length; idx += 2)
+        {
             Character chr = (Character) recipe[idx];
             Object in = recipe[idx + 1];
 
-			if (in instanceof IBloodOrb || (in instanceof ItemStack && ((ItemStack)in).getItem() instanceof IBloodOrb)) { //If the item is an instanceof IBloodOrb then save the level of the orb
+            if (in instanceof IBloodOrb || (in instanceof ItemStack && ((ItemStack) in).getItem() instanceof IBloodOrb))
-				if(in instanceof ItemStack) itemMap.put(chr, (Integer)(((IBloodOrb)((ItemStack)in).getItem()).getOrbLevel()));
+            { //If the item is an instanceof IBloodOrb then save the level of the orb
+                if (in instanceof ItemStack)
+                    itemMap.put(chr, (Integer) (((IBloodOrb) ((ItemStack) in).getItem()).getOrbLevel()));
                 else itemMap.put(chr, (Integer) (((IBloodOrb) in).getOrbLevel()));
-			} else if (in instanceof ItemStack) {
+            } else if (in instanceof ItemStack)
+            {
                 itemMap.put(chr, ((ItemStack) in).copy());
-			} else if (in instanceof Item) {
+            } else if (in instanceof Item)
+            {
                 itemMap.put(chr, new ItemStack((Item) in));
-			} else if (in instanceof Block) {
+            } else if (in instanceof Block)
+            {
                 itemMap.put(chr, new ItemStack((Block) in, 1, OreDictionary.WILDCARD_VALUE));
-			} else if (in instanceof String) {
+            } else if (in instanceof String)
+            {
                 itemMap.put(chr, OreDictionary.getOres((String) in));
-			} else {
+            } else
+            {
                 String ret = "Invalid shaped ore recipe: ";
-				for (Object tmp : recipe) {
+                for (Object tmp : recipe)
+                {
                     ret += tmp + ", ";
                 }
                 ret += output;
@@ -106,19 +130,22 @@ public class ShapedBloodOrbRecipe implements IRecipe {
 
         input = new Object[width * height];
         int x = 0;
-		for (char chr : shape.toCharArray()) {
+        for (char chr : shape.toCharArray())
+        {
             input[x++] = itemMap.get(chr);
         }
     }
 
-	ShapedBloodOrbRecipe(ShapedRecipes recipe, Map<ItemStack, String> replacements) {
+    ShapedBloodOrbRecipe(ShapedRecipes recipe, Map<ItemStack, String> replacements)
+    {
         output = recipe.getRecipeOutput();
         width = recipe.recipeWidth;
         height = recipe.recipeHeight;
 
         input = new Object[recipe.recipeItems.length];
 
-		for (int i = 0; i < input.length; i++) {
+        for (int i = 0; i < input.length; i++)
+        {
             ItemStack ingred = recipe.recipeItems[i];
 
             if (ingred == null)
@@ -126,8 +153,10 @@ public class ShapedBloodOrbRecipe implements IRecipe {
 
             input[i] = recipe.recipeItems[i];
 
-			for (Entry<ItemStack, String> replace : replacements.entrySet()) {
+            for (Entry<ItemStack, String> replace : replacements.entrySet())
-				if (OreDictionary.itemMatches(replace.getKey(), ingred, true)) {
+            {
+                if (OreDictionary.itemMatches(replace.getKey(), ingred, true))
+                {
                     input[i] = OreDictionary.getOres(replace.getValue());
                     break;
                 }
@@ -136,29 +165,37 @@ public class ShapedBloodOrbRecipe implements IRecipe {
     }
 
     @Override
-	public ItemStack getCraftingResult(InventoryCrafting var1) {
+    public ItemStack getCraftingResult(InventoryCrafting var1)
+    {
         return output.copy();
     }
 
     @Override
-	public int getRecipeSize() {
+    public int getRecipeSize()
+    {
         return input.length;
     }
 
     @Override
-	public ItemStack getRecipeOutput() {
+    public ItemStack getRecipeOutput()
+    {
         return output;
     }
 
     @Override
-	public boolean matches(InventoryCrafting inv, World world) {
+    public boolean matches(InventoryCrafting inv, World world)
-		for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++) {
+    {
-			for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y) {
+        for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++)
-				if (checkMatch(inv, x, y, false)) {
+        {
+            for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y)
+            {
+                if (checkMatch(inv, x, y, false))
+                {
                     return true;
                 }
 
-				if (mirrored && checkMatch(inv, x, y, true)) {
+                if (mirrored && checkMatch(inv, x, y, true))
+                {
                     return true;
                 }
             }
@@ -168,46 +205,61 @@ public class ShapedBloodOrbRecipe implements IRecipe {
     }
 
     @SuppressWarnings("unchecked")
-	private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) {
+    private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror)
-		for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) {
+    {
-			for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++) {
+        for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++)
+        {
+            for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++)
+            {
                 int subX = x - startX;
                 int subY = y - startY;
                 Object target = null;
 
-				if (subX >= 0 && subY >= 0 && subX < width && subY < height) {
+                if (subX >= 0 && subY >= 0 && subX < width && subY < height)
-					if (mirror) {
+                {
+                    if (mirror)
+                    {
                         target = input[width - subX - 1 + subY * width];
-					} else {
+                    } else
+                    {
                         target = input[subX + subY * width];
                     }
                 }
 
                 ItemStack slot = inv.getStackInRowAndColumn(x, y);
                 //If target is integer, then we should be check the blood orb value of the item instead
-				if(target instanceof Integer) {
+                if (target instanceof Integer)
-					if(slot != null && slot.getItem() instanceof IBloodOrb) {
+                {
+                    if (slot != null && slot.getItem() instanceof IBloodOrb)
+                    {
                         IBloodOrb orb = (IBloodOrb) slot.getItem();
-						if(orb.getOrbLevel() < (Integer)target) {
+                        if (orb.getOrbLevel() < (Integer) target)
+                        {
                             return false;
                         }
                     } else return false;
-				} else if (target instanceof ItemStack) {
+                } else if (target instanceof ItemStack)
-					if (!OreDictionary.itemMatches((ItemStack) target, slot, false)) {
+                {
+                    if (!OreDictionary.itemMatches((ItemStack) target, slot, false))
+                    {
                         return false;
                     }
-				} else if (target instanceof ArrayList) {
+                } else if (target instanceof ArrayList)
+                {
                     boolean matched = false;
 
                     Iterator<ItemStack> itr = ((ArrayList<ItemStack>) target).iterator();
-					while (itr.hasNext() && !matched) {
+                    while (itr.hasNext() && !matched)
+                    {
                         matched = OreDictionary.itemMatches(itr.next(), slot, false);
                     }
 
-					if (!matched) {
+                    if (!matched)
+                    {
                         return false;
                     }
-				} else if (target == null && slot != null) {
+                } else if (target == null && slot != null)
+                {
                     return false;
                 }
             }
@@ -216,12 +268,14 @@ public class ShapedBloodOrbRecipe implements IRecipe {
         return true;
     }
 
-	public ShapedBloodOrbRecipe setMirrored(boolean mirror) {
+    public ShapedBloodOrbRecipe setMirrored(boolean mirror)
+    {
         mirrored = mirror;
         return this;
     }
 
-	public Object[] getInput() {
+    public Object[] getInput()
+    {
         return this.input;
     }
 }

1.7.10/main/java/WayofTime/alchemicalWizardry/api/items/ShapelessBloodOrbRecipe.java

@@ -1,11 +1,6 @@
 package WayofTime.alchemicalWizardry.api.items;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import net.minecraft.block.Block;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -14,37 +9,56 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapelessRecipes;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
-import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
 
-/** Shapeless Blood Orb Recipe Handler by joshie **/
+import java.util.ArrayList;
-public class ShapelessBloodOrbRecipe implements IRecipe {
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * Shapeless Blood Orb Recipe Handler by joshie *
+ */
+public class ShapelessBloodOrbRecipe implements IRecipe
+{
     private ItemStack output = null;
     private ArrayList<Object> input = new ArrayList<Object>();
 
-	public ShapelessBloodOrbRecipe(Block result, Object... recipe) {
+    public ShapelessBloodOrbRecipe(Block result, Object... recipe)
+    {
         this(new ItemStack(result), recipe);
     }
 
-	public ShapelessBloodOrbRecipe(Item result, Object... recipe) {
+    public ShapelessBloodOrbRecipe(Item result, Object... recipe)
+    {
         this(new ItemStack(result), recipe);
     }
 
-	public ShapelessBloodOrbRecipe(ItemStack result, Object... recipe) {
+    public ShapelessBloodOrbRecipe(ItemStack result, Object... recipe)
+    {
         output = result.copy();
-		for (Object in : recipe) {
+        for (Object in : recipe)
-			if (in instanceof ItemStack) {
+        {
+            if (in instanceof ItemStack)
+            {
                 input.add(((ItemStack) in).copy());
-			} else if (in instanceof IBloodOrb) { //If the item is an instanceof IBloodOrb then save the level of the orb
+            } else if (in instanceof IBloodOrb)
+            { //If the item is an instanceof IBloodOrb then save the level of the orb
                 input.add((Integer) (((IBloodOrb) in).getOrbLevel()));
-			} else if (in instanceof Item) {
+            } else if (in instanceof Item)
+            {
                 input.add(new ItemStack((Item) in));
-			} else if (in instanceof Block) {
+            } else if (in instanceof Block)
+            {
                 input.add(new ItemStack((Block) in));
-			} else if (in instanceof String) {
+            } else if (in instanceof String)
+            {
                 input.add(OreDictionary.getOres((String) in));
-			} else {
+            } else
+            {
                 String ret = "Invalid shapeless ore recipe: ";
-				for (Object tmp : recipe) {
+                for (Object tmp : recipe)
+                {
                     ret += tmp + ", ";
                 }
                 ret += output;
@@ -54,13 +68,17 @@ public class ShapelessBloodOrbRecipe implements IRecipe {
     }
 
     @SuppressWarnings("unchecked")
-	ShapelessBloodOrbRecipe(ShapelessRecipes recipe, Map<ItemStack, String> replacements) {
+    ShapelessBloodOrbRecipe(ShapelessRecipes recipe, Map<ItemStack, String> replacements)
+    {
         output = recipe.getRecipeOutput();
 
-		for (ItemStack ingred : ((List<ItemStack>) recipe.recipeItems)) {
+        for (ItemStack ingred : ((List<ItemStack>) recipe.recipeItems))
+        {
             Object finalObj = ingred;
-			for (Entry<ItemStack, String> replace : replacements.entrySet()) {
+            for (Entry<ItemStack, String> replace : replacements.entrySet())
-				if (OreDictionary.itemMatches(replace.getKey(), ingred, false)) {
+            {
+                if (OreDictionary.itemMatches(replace.getKey(), ingred, false))
+                {
                     finalObj = OreDictionary.getOres(replace.getValue());
                     break;
                 }
@@ -70,62 +88,77 @@ public class ShapelessBloodOrbRecipe implements IRecipe {
     }
 
     @Override
-	public int getRecipeSize() {
+    public int getRecipeSize()
+    {
         return input.size();
     }
 
     @Override
-	public ItemStack getRecipeOutput() {
+    public ItemStack getRecipeOutput()
+    {
         return output;
     }
 
     @Override
-	public ItemStack getCraftingResult(InventoryCrafting var1) {
+    public ItemStack getCraftingResult(InventoryCrafting var1)
+    {
         return output.copy();
     }
 
     @SuppressWarnings("unchecked")
     @Override
-	public boolean matches(InventoryCrafting var1, World world) {
+    public boolean matches(InventoryCrafting var1, World world)
+    {
         ArrayList<Object> required = new ArrayList<Object>(input);
 
-		for (int x = 0; x < var1.getSizeInventory(); x++) {
+        for (int x = 0; x < var1.getSizeInventory(); x++)
+        {
             ItemStack slot = var1.getStackInSlot(x);
 
-			if (slot != null) {
+            if (slot != null)
+            {
                 boolean inRecipe = false;
                 Iterator<Object> req = required.iterator();
 
-				while (req.hasNext()) {
+                while (req.hasNext())
+                {
                     boolean match = false;
 
                     Object next = req.next();
 
                     //If target is integer, then we should be check the blood orb value of the item instead
-					if(next instanceof Integer) {
+                    if (next instanceof Integer)
-						if(slot != null && slot.getItem() instanceof IBloodOrb) {
+                    {
+                        if (slot != null && slot.getItem() instanceof IBloodOrb)
+                        {
                             IBloodOrb orb = (IBloodOrb) slot.getItem();
-							if(orb.getOrbLevel() < (Integer)next) {
+                            if (orb.getOrbLevel() < (Integer) next)
+                            {
                                 return false;
                             }
                         } else return false;
-					} else if (next instanceof ItemStack) {
+                    } else if (next instanceof ItemStack)
+                    {
                         match = OreDictionary.itemMatches((ItemStack) next, slot, false);
-					} else if (next instanceof ArrayList) {
+                    } else if (next instanceof ArrayList)
+                    {
                         Iterator<ItemStack> itr = ((ArrayList<ItemStack>) next).iterator();
-						while (itr.hasNext() && !match) {
+                        while (itr.hasNext() && !match)
+                        {
                             match = OreDictionary.itemMatches(itr.next(), slot, false);
                         }
                     }
 
-					if (match) {
+                    if (match)
+                    {
                         inRecipe = true;
                         required.remove(next);
                         break;
                     }
                 }
 
-				if (!inRecipe) {
+                if (!inRecipe)
+                {
                     return false;
                 }
             }
@@ -134,7 +167,8 @@ public class ShapelessBloodOrbRecipe implements IRecipe {
         return required.isEmpty();
     }
 
-	public ArrayList<Object> getInput() {
+    public ArrayList<Object> getInput()
+    {
         return this.input;
     }
 }

1.7.10/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java

@@ -1,8 +1,8 @@
 package WayofTime.alchemicalWizardry.api.rituals;
 
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ISegmentedReagentHandler;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ISegmentedReagentHandler;
 
 public interface IMasterRitualStone extends ISegmentedReagentHandler
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/api/rituals/RitualEffect.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.api.rituals;
 
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.common.util.ForgeDirection;
 import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
 import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import java.util.List;
 
 public abstract class RitualEffect
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java

@@ -1,15 +1,15 @@
 package WayofTime.alchemicalWizardry.api.rituals;
 
+import WayofTime.alchemicalWizardry.common.renderer.MRSRenderer;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.common.renderer.MRSRenderer;
-
 public class Rituals
 {
     private int crystalLevel;
@@ -40,6 +40,7 @@ public class Rituals
 
     /**
      * Static method to register a ritual to the Ritual Registry
+     *
      * @param key          Unique identification key - must be different from all others to properly register
      * @param crystalLevel Crystal level required to activate
      * @param actCost      LP amount required to activate
@@ -52,8 +53,7 @@ public class Rituals
         if (ritualMap.containsKey(key))
         {
             return false;
-    	}
+        } else
-    	else
         {
             Rituals ritual = new Rituals(crystalLevel, actCost, effect, name, renderer);
             ritual.removeRitualFromList();
@@ -68,8 +68,7 @@ public class Rituals
         if (ritualMap.containsKey(key))
         {
             return false;
-    	}
+        } else
-    	else
         {
             Rituals ritual = new Rituals(crystalLevel, actCost, effect, name);
             ritual.removeRitualFromList();

1.7.10/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java

@@ -1,7 +1,6 @@
 package WayofTime.alchemicalWizardry.api.soulNetwork;
 
-import java.util.UUID;
+import com.mojang.authlib.GameProfile;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -11,7 +10,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
+import java.util.UUID;
 
 public class SoulNetworkHandler
 {
@@ -25,8 +24,6 @@ public class SoulNetworkHandler
         MinecraftServer server = MinecraftServer.getServer();
         GameProfile gameProfile;
         gameProfile = server.func_152358_ax().func_152652_a(uuid);
-//		LogHelper.info("player is " + gameProfile.getName() + " : " + gameProfile.getId());
-		
         return null;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java

@@ -1,11 +1,5 @@
 package WayofTime.alchemicalWizardry.client;
 
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.client.event.RenderPlayerEvent;
-import net.minecraftforge.client.event.sound.SoundEvent;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.client.renderer.RenderHelper;
 import cpw.mods.fml.client.FMLClientHandler;
@@ -13,6 +7,11 @@ import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.client.event.RenderPlayerEvent;
+import net.minecraftforge.client.event.sound.SoundEvent;
+import org.lwjgl.opengl.GL11;
 
 public class ClientEventHandler
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java

@@ -1,89 +1,29 @@
 package WayofTime.alchemicalWizardry.client;
 
-import net.minecraft.item.ItemBlock;
-import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
 import WayofTime.alchemicalWizardry.ModBlocks;
 import WayofTime.alchemicalWizardry.common.CommonProxy;
 import WayofTime.alchemicalWizardry.common.EntityAirElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityBileDemon;
+import WayofTime.alchemicalWizardry.common.entity.mob.*;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityBoulderFist;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityEarthElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityFallenAngel;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityFireElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityHolyElemental;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityIceDemon;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityLowerGuardian;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityShade;
-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.entity.projectile.EnergyBlastProjectile;
 import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
 import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor;
 import WayofTime.alchemicalWizardry.common.entity.projectile.EntityParticleBeam;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderAlchemicCalcinator;
+import WayofTime.alchemicalWizardry.common.renderer.block.*;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderConduit;
+import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.*;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderCrystalBelljar;
+import WayofTime.alchemicalWizardry.common.renderer.mob.*;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderMasterStone;
+import WayofTime.alchemicalWizardry.common.renderer.model.*;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderPedestal;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderPlinth;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderReagentConduit;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderSpellEffectBlock;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderSpellEnhancementBlock;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderSpellModifierBlock;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderSpellParadigmBlock;
-import WayofTime.alchemicalWizardry.common.renderer.block.RenderWritingTable;
-import WayofTime.alchemicalWizardry.common.renderer.block.ShaderHelper;
-import WayofTime.alchemicalWizardry.common.renderer.block.TEAltarRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TEAlchemicalCalcinatorItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TEAltarItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TEBellJarItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TEConduitItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TESpellEffectBlockItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TESpellEnhancementBlockItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TESpellModifierBlockItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TESpellParadigmBlockItemRenderer;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderBileDemon;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderBoulderFist;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderElemental;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderFallenAngel;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderIceDemon;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderLowerGuardian;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderShade;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderSmallEarthGolem;
-import WayofTime.alchemicalWizardry.common.renderer.mob.RenderWingedFireDemon;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelBileDemon;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelBoulderFist;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelElemental;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelFallenAngel;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelIceDemon;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelLowerGuardian;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelShade;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelSmallEarthGolem;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelWingedFireDemon;
 import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderEnergyBazookaMainProjectile;
 import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderEnergyBlastProjectile;
 import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderMeteor;
 import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator;
+import WayofTime.alchemicalWizardry.common.tileEntity.*;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEnhancementBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.world.World;
+import net.minecraftforge.client.MinecraftForgeClient;
 
 public class ClientProxy extends CommonProxy
 {
@@ -93,39 +33,24 @@ public class ClientProxy extends CommonProxy
     @Override
     public void registerRenderers()
     {
-        //altarRenderType = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerEntityRenderingHandler(EnergyBlastProjectile.class, new RenderEnergyBlastProjectile());
         RenderingRegistry.registerEntityRenderingHandler(EntityEnergyBazookaMainProjectile.class, new RenderEnergyBazookaMainProjectile());
         RenderingRegistry.registerEntityRenderingHandler(EntitySpellProjectile.class, new RenderEnergyBlastProjectile());
         RenderingRegistry.registerEntityRenderingHandler(EntityParticleBeam.class, new RenderEnergyBlastProjectile());
         RenderingRegistry.registerEntityRenderingHandler(EntityMeteor.class, new RenderMeteor());
-        //EntityRegistry.registerGlobalEntityID(EntityFallenAngel.class, "AlchemicalWizardry.FallenAngel", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityFallenAngel.class, new RenderFallenAngel(new ModelFallenAngel(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityLowerGuardian.class, "AlchemicalWizardry.LowerGuardian", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityLowerGuardian.class, new RenderLowerGuardian(new ModelLowerGuardian(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityBileDemon.class, "AlchemicalWizardry.BileDemon", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityBileDemon.class, new RenderBileDemon(new ModelBileDemon(), 1.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityWingedFireDemon.class, "AlchemicalWizardry.WingedFireDemon", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityWingedFireDemon.class, new RenderWingedFireDemon(new ModelWingedFireDemon(), 1.0F));
-        //EntityRegistry.registerGlobalEntityID(EntitySmallEarthGolem.class, "AlchemicalWizardry.SmallEarthGolem", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntitySmallEarthGolem.class, new RenderSmallEarthGolem(new ModelSmallEarthGolem(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityIceDemon.class, "AlchemicalWizardry.IceDemon", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityIceDemon.class, new RenderIceDemon(new ModelIceDemon(), 0.5F));
-        // EntityRegistry.registerGlobalEntityID(EntityBoulderFist.class, "AlchemicalWizardry.BoulderFist", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityBoulderFist.class, new RenderBoulderFist(new ModelBoulderFist(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityShade.class, "AlchemicalWizardry.Shade", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityShade.class, new RenderShade(new ModelShade(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityAirElemental.class, "AlchemicalWizardry.AirElemental", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityAirElemental.class, new RenderElemental(new ModelElemental(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityWaterElemental.class, "AlchemicalWizardry.WaterElemental", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityWaterElemental.class, new RenderElemental(new ModelElemental(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityEarthElemental.class, "AlchemicalWizardry.EarthElemental", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityEarthElemental.class, new RenderElemental(new ModelElemental(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityFireElemental.class, "AlchemicalWizardry.FireElemental", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityFireElemental.class, new RenderElemental(new ModelElemental(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityShadeElemental.class, "AlchemicalWizardry.ShadeElemental", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityShadeElemental.class, new RenderElemental(new ModelElemental(), 0.5F));
-        //EntityRegistry.registerGlobalEntityID(EntityHolyElemental.class, "AlchemicalWizardry.HolyElemental", EntityRegistry.findGlobalUniqueEntityId(),0x40FF00, 0x0B610B);
         RenderingRegistry.registerEntityRenderingHandler(EntityHolyElemental.class, new RenderElemental(new ModelElemental(), 0.5F));
         ClientRegistry.bindTileEntitySpecialRenderer(TEAltar.class, new TEAltarRenderer());
         ClientRegistry.bindTileEntitySpecialRenderer(TEPedestal.class, new RenderPedestal());
@@ -149,10 +74,6 @@ public class ClientProxy extends CommonProxy
         MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockSpellModifier), new TESpellModifierBlockItemRenderer());
         MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockAlchemicCalcinator), new TEAlchemicalCalcinatorItemRenderer());
         MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockCrystalBelljar), new TEBellJarItemRenderer());
-        
-        //RenderingRegistry.registerEntityRenderingHandler(FireProjectile.class, new RenderFireProjectile());
-        //RenderingRegistry.registerBlockHandler(new AltarRenderer());
-        
         ShaderHelper.initShaders();
     }
 
@@ -165,9 +86,7 @@ public class ClientProxy extends CommonProxy
     @Override
     public void InitRendering()
     {
-        
         MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockAltar), new TEAltarItemRenderer());
-        //MinecraftForgeClient.registerItemRenderer(AlchemicalWizardry.blockWritingTable.blockID, new TEWritingTableItemRenderer());
     }
 
     @Override

1.7.10/main/java/WayofTime/alchemicalWizardry/client/renderer/ColourThreshold.java

@@ -1,6 +1,7 @@
 package WayofTime.alchemicalWizardry.client.renderer;
 
 import java.util.List;
+
 /**
  * This class is a utility class that was created by bspkrs.
  * https://github.com/bspkrs/bspkrsCore/blob/master/src/main/java/bspkrs/client/util/ColorThreshold.java

1.7.10/main/java/WayofTime/alchemicalWizardry/client/renderer/HUDElement.java

@@ -1,14 +1,12 @@
 package WayofTime.alchemicalWizardry.client.renderer;
 
+import WayofTime.alchemicalWizardry.BloodMagicConfiguration;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.item.ItemStack;
-
 import org.lwjgl.opengl.GL11;
 
-import WayofTime.alchemicalWizardry.BloodMagicConfiguration;
-
 public class HUDElement
 {
     public final ItemStack itemStack;
@@ -80,8 +78,7 @@ public class HUDElement
                 {
                     itemDamage = "\247" + ColourThreshold.getColorCode(BloodMagicConfiguration.colorList,
                             (thresholdPercent ? damage * 100 / maxDamage : damage)) + this.value;
-                }
+                } else if (showValue)
-                else if (showValue)
                     itemDamage = "\247" + ColourThreshold.getColorCode(BloodMagicConfiguration.colorList,
                             (thresholdPercent ? damage * 100 / maxDamage : damage)) + damage +
                             (showMaxDamage ? "/" + maxDamage : "");
@@ -127,8 +124,7 @@ public class HUDElement
             mc.fontRenderer.drawStringWithShadow(itemName + "\247r", x - (padW + iconW + padW) - itemNameW, y, 0xffffff);
             mc.fontRenderer.drawStringWithShadow(itemDamage + "\247r", x - (padW + iconW + padW) - itemDamageW,
                     y + (enableItemName ? elementH / 2 : elementH / 4), 0xffffff);
-        }
+        } else
-        else
         {
             itemRenderer.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), itemStack, x, y);
             HUDUtils.renderItemOverlayIntoGUI(mc.fontRenderer, itemStack, x, y, showDamageOverlay, showItemCount);

1.7.10/main/java/WayofTime/alchemicalWizardry/client/renderer/HUDUtils.java

@@ -9,7 +9,6 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.opengl.GL11;
 
 /**

1.7.10/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java

@@ -1,26 +1,22 @@
 package WayofTime.alchemicalWizardry.client.renderer;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IReagentHandler;
-import java.util.List;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo;
-
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-
 import org.lwjgl.opengl.GL11;
 
-import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import java.util.ArrayList;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.IReagentHandler;
+import java.util.List;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class RenderHelper
 {
@@ -163,8 +159,7 @@ public class RenderHelper
                     e.renderToHud((alignMode.toLowerCase().contains("right") ? getX(0) : getX(e.width())), yBase);
                     yBase += yOffset;
                 }
-            }
+            } else if (listMode.equalsIgnoreCase("horizontal"))
-            else if (listMode.equalsIgnoreCase("horizontal"))
             {
                 int totalWidth = getElementsWidth(elements);
                 int yBase = getY(1, yOffset);

1.7.10/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java

@@ -1,11 +1,13 @@
 package WayofTime.alchemicalWizardry.common;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import java.util.HashMap;
+import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
-import java.util.Iterator;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import java.util.List;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import java.util.Map;
+import cpw.mods.fml.common.ObfuscationReflectionHelper;
-
+import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IProjectile;
@@ -26,14 +28,8 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
+import java.util.*;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
 
 public class AlchemicalWizardryEventHooks
 {
@@ -376,7 +372,6 @@ public class AlchemicalWizardryEventHooks
                 String ownerName = SpellHelper.getUsername(entityPlayer);
                 playerFlightBuff.put(ownerName, true);
                 entityPlayer.capabilities.allowFlying = true;
-                //entityPlayer.sendPlayerAbilities();
             }
         } else
         {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java

@@ -1,5 +1,9 @@
 package WayofTime.alchemicalWizardry.common;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.items.LavaCrystal;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import cpw.mods.fml.common.IFuelHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -7,10 +11,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.server.MinecraftServer;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.items.LavaCrystal;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import cpw.mods.fml.common.IFuelHandler;
 
 public class AlchemicalWizardryFuelHandler implements IFuelHandler
 {
@@ -27,10 +27,6 @@ public class AlchemicalWizardryFuelHandler implements IFuelHandler
 
         if (fuelItem.equals(ModItems.lavaCrystal))
         {
-            /*ItemStack newItem = new ItemStack(AlchemicalWizardry.lavaCrystal);
-            newItem.getItem().setDamage(newItem, 50);
-            fuel.getItem().setContainerItem(((LavaCrystal)newItem.getItem()).change());
-            */
             LavaCrystal item = (LavaCrystal) fuel.getItem();
 
             if (item.hasEnoughEssence(fuel))

1.7.10/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryTickHandler.java

@@ -1,47 +0,0 @@
-package WayofTime.alchemicalWizardry.common;
-
-import java.util.EnumSet;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.PlayerCapabilities;
-import net.minecraft.server.MinecraftServer;
-import cpw.mods.fml.common.ObfuscationReflectionHelper;
-
-@Deprecated
-public class AlchemicalWizardryTickHandler //implements ITickHandler
-{
-//    public void tickStart(EnumSet<TickType> type, Object... tickData)
-//    {
-//    }
-//
-//    public EnumSet<TickType> ticks()
-//    {
-//        return EnumSet.of(TickType.PLAYER);
-//    }
-//
-//    public String getLabel()
-//    {
-//        return "BloodMagic";
-//    }
-//
-//    public void tickEnd(EnumSet<TickType> type, Object... tickData)
-//    {
-//        String[] usernames = MinecraftServer.getServer().getAllUsernames();
-//
-//        if (usernames == null)
-//        {
-//            return;
-//        }
-//
-//        for (String userName : usernames)
-//        {
-//            EntityPlayer entityPlayer = MinecraftServer.getServer().getConfigurationManager().getPlayerForUsername(userName);
-//
-//            if (entityPlayer != null)
-//            {
-//                ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, entityPlayer.capabilities, Float.valueOf(0.1f), new String[]{"walkSpeed", "g", "field_75097_g"});
-//                //entityPlayer.sendPlayerAbilities();
-//            }
-//        }
-//    }
-}

1.7.10/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java

@@ -1,27 +1,13 @@
 package WayofTime.alchemicalWizardry.common;
 
-import net.minecraft.world.World;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
+import WayofTime.alchemicalWizardry.common.entity.projectile.*;
-import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaSecondaryProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor;
-import WayofTime.alchemicalWizardry.common.entity.projectile.EntityParticleBeam;
-import WayofTime.alchemicalWizardry.common.entity.projectile.ExplosionProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.FireProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.LightningBoltProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.MudProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.TeleportProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.WaterProjectile;
-import WayofTime.alchemicalWizardry.common.entity.projectile.WindGustProjectile;
 import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.world.World;
 
 public class CommonProxy
 {
@@ -49,7 +35,6 @@ public class CommonProxy
 
     public void registerEvents()
     {
-    	
     }
 
     public void registerSoundHandler()

1.7.10/main/java/WayofTime/alchemicalWizardry/common/EntityAIFly.java

@@ -1,5 +0,0 @@
-package WayofTime.alchemicalWizardry.common;
-
-public class EntityAIFly
-{
-}

1.7.10/main/java/WayofTime/alchemicalWizardry/common/EntityAirElemental.java

@@ -1,15 +1,14 @@
 package WayofTime.alchemicalWizardry.common;
 
-import ibxm.Player;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.entity.mob.EntityElemental;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.monster.IMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.entity.mob.EntityElemental;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class EntityAirElemental extends EntityElemental implements IMob
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/LifeBucketHandler.java

@@ -1,14 +1,14 @@
 package WayofTime.alchemicalWizardry.common;
 
+import WayofTime.alchemicalWizardry.ModBlocks;
+import WayofTime.alchemicalWizardry.ModItems;
+import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
-import WayofTime.alchemicalWizardry.ModBlocks;
-import WayofTime.alchemicalWizardry.ModItems;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class LifeBucketHandler
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/LifeEssence.java

@@ -7,11 +7,8 @@ public class LifeEssence extends Fluid
     public LifeEssence(String fluidName)
     {
         super(fluidName);
-        //setUnlocalizedName("lifeEssence");
-        //setBlockID(id);
         this.setDensity(2000);
         this.setViscosity(2000);
-        //this.setFlowingIcon(flowingIcon)
     }
 
     @Override

1.7.10/main/java/WayofTime/alchemicalWizardry/common/ModLivingDropsEvent.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.common;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
-import WayofTime.alchemicalWizardry.ModItems;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class ModLivingDropsEvent
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java

@@ -1,31 +1,8 @@
 package WayofTime.alchemicalWizardry.common;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-import java.util.EnumMap;
-import java.util.LinkedList;
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.Packet;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.ColourAndCoords;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
+import WayofTime.alchemicalWizardry.common.tileEntity.*;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEOrientable;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
-import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.FMLEmbeddedChannel;
 import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;
@@ -33,11 +10,25 @@ import cpw.mods.fml.common.network.FMLOutboundHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.Packet;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import java.util.EnumMap;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * Handles the packet wrangling for IronChest
-* @author cpw
  *
+ * @author cpw
  */
 public enum NewPacketHandler
 {
@@ -89,7 +80,6 @@ public enum NewPacketHandler
      * on the client.
      *
      * @author cpw
-    *
      */
     private static class TEAltarMessageHandler extends SimpleChannelInboundHandler<TEAltarMessage>
     {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/PacketHandler.java

@@ -1,966 +0,0 @@
-package WayofTime.alchemicalWizardry.common;
-
-import ibxm.Player;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Random;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.DamageSource;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEOrientable;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
-import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
-
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
-import com.jcraft.jogg.Packet;
-
-public class PacketHandler //implements IPacketHandler
-{
-//    @Override
-//    public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
-//    {
-//        if (packet.channel.equals("BloodAltar"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            int x = dat.readInt();
-//            int y = dat.readInt();
-//            int z = dat.readInt();
-//            boolean hasStacks = dat.readByte() != 0;
-//            int[] items = new int[0];
-//
-//            if (hasStacks)
-//            {
-//                items = new int[1 * 3];
-//
-//                for (int i = 0; i < items.length; i++)
-//                {
-//                    items[i] = dat.readInt();
-//                }
-//            }
-//
-//            int fluidIDMain = dat.readInt();
-//            int fluidAmountMain = dat.readInt();
-//            int fluidIDOutput = dat.readInt();
-//            int fluidAmountOutput = dat.readInt();
-//            int fluidIDInput = dat.readInt();
-//            int fluidAmountInput = dat.readInt();
-//            int capacity = dat.readInt();
-//            World world = AlchemicalWizardry.proxy.getClientWorld();
-//            TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-//
-//            if (tileEntity instanceof TEAltar)
-//            {
-//                TEAltar tileEntityAltar = (TEAltar) tileEntity;
-//                FluidStack flMain = new FluidStack(fluidIDMain, fluidAmountMain);
-//                FluidStack flOutput = new FluidStack(fluidIDOutput, fluidAmountOutput);
-//                FluidStack flInput = new FluidStack(fluidIDInput, fluidAmountInput);
-//                tileEntityAltar.handlePacketData(items, flMain, flOutput, flInput, capacity);
-//            }
-//        } else if (packet.channel.equals("FallReset"))
-//        {
-//            if (player instanceof EntityPlayer)
-//            {
-//                ((EntityPlayer) player).fallDistance = 0;
-//            }
-//        } else if (packet.channel.equals("particle"))
-//        {
-//            ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
-//            DataInputStream din = new DataInputStream(bin);
-//            Random rand = new Random();
-//
-//            try
-//            {
-//                double x = din.readDouble();
-//                double y = din.readDouble();
-//                double z = din.readDouble();
-//                short particleType = din.readShort();
-//                World world = ((EntityPlayer) player).worldObj;
-//
-//                if (particleType == 1)
-//                {
-//                    world.spawnParticle("mobSpell", x + 0.5D + rand.nextGaussian() / 8, y + 1.1D, z + 0.5D + rand.nextGaussian() / 8, 0.5117D, 0.0117D, 0.0117D);
-//                }
-//
-//                if (particleType == 2)
-//                {
-//                    world.spawnParticle("reddust", x + 0.5D + rand.nextGaussian() / 8, y + 1.1D, z + 0.5D + rand.nextGaussian() / 8, 0.82D, 0.941D, 0.91D);
-//                }
-//
-//                if (particleType == 3)
-//                {
-//                    world.spawnParticle("mobSpell", x + 0.5D + rand.nextGaussian() / 8, y + 1.1D, z + 0.5D + rand.nextGaussian() / 8, 1.0D, 0.371D, 0.371D);
-//                }
-//
-//                if (particleType == 4)
-//                {
-//                    float f = (float) 1.0F;
-//                    float f1 = f * 0.6F + 0.4F;
-//                    float f2 = f * f * 0.7F - 0.5F;
-//                    float f3 = f * f * 0.6F - 0.7F;
-//
-//                    for (int l = 0; l < 8; ++l)
-//                    {
-//                        world.spawnParticle("reddust", x + Math.random() - Math.random(), y + Math.random() - Math.random(), z + Math.random() - Math.random(), f1, f2, f3);
-//                    }
-//                }
-//            } catch (IOException e)
-//            {
-//                e.printStackTrace();
-//            }
-//        } else if (packet.channel.equals("CustomParticle"))
-//        {
-//            ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
-//            DataInputStream din = new DataInputStream(bin);
-//            Random rand = new Random();
-//
-//            try
-//            {
-//                World world = ((EntityPlayer) player).worldObj;
-//                int size = din.readInt();
-//                String str = "";
-//
-//                for (int i = 0; i < size; i++)
-//                {
-//                    str = str + din.readChar();
-//                }
-//
-//                double x = din.readDouble();
-//                double y = din.readDouble();
-//                double z = din.readDouble();
-//                double xVel = din.readDouble();
-//                double yVel = din.readDouble();
-//                double zVel = din.readDouble();
-//                world.spawnParticle(str, x, y, z, xVel, yVel, zVel);
-//            } catch (IOException e)
-//            {
-//                e.printStackTrace();
-//            }
-//        } else if (packet.channel.equals("SetLifeEssence")) //Sets the data for the character
-//        {
-//            ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
-//            DataInputStream din = new DataInputStream(bin);
-//
-//            try
-//            {
-//                EntityPlayer user = (EntityPlayer) player;
-//                int length = din.readInt();
-//                String ownerName = "";
-//
-//                for (int i = 0; i < length; i++)
-//                {
-//                    ownerName = ownerName + din.readChar();
-//                }
-//
-//                int addedEssence = din.readInt();
-//                int maxEssence = din.readInt();
-//                World world = MinecraftServer.getServer().worldServers[0];
-//                LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName);
-//
-//                if (data == null)
-//                {
-//                    data = new LifeEssenceNetwork(ownerName);
-//                    world.setItemData(ownerName, data);
-//                }
-//
-//                if (addedEssence > 0)
-//                {
-//                    if (data.currentEssence < maxEssence)
-//                    {
-//                        data.currentEssence = Math.min(maxEssence, data.currentEssence + addedEssence);
-//                        data.markDirty();
-//                    }
-//
-//                    if (!user.capabilities.isCreativeMode)
-//                    {
-//                        for (int i = 0; i < ((addedEssence + 99) / 100); i++)
-//                        {
-//                            //player.setEntityHealth((player.getHealth()-1));
-//                            user.setHealth((user.getHealth() - 1));
-//
-//                            if (user.getHealth() <= 0.5f)
-//                            {
-//                                //user.inventory.dropAllItems();
-//                                user.onDeath(DamageSource.generic);
-//                                return;
-//                            }
-//                        }
-//                    }
-//                } else
-//                {
-//                    int removedEssence = -addedEssence;
-//
-//                    if ((data.currentEssence - removedEssence) >= 0)
-//                    {
-//                        data.currentEssence -= removedEssence;
-//                        data.markDirty();
-//                    } else
-//                    {
-//                        if (removedEssence >= 100)
-//                        {
-//                            for (int i = 0; i < ((removedEssence + 99) / 100); i++)
-//                            {
-//                                //player.setEntityHealth((player.getHealth()-1));
-//                                user.setHealth((user.getHealth() - 1));
-//
-//                                if (user.getHealth() <= 0.5f)
-//                                {
-//                                    //user.inventory.dropAllItems();
-//                                    user.onDeath(DamageSource.generic);
-//                                    return;
-//                                }
-//                            }
-//                        } else
-//                        {
-//                            if (user.worldObj.rand.nextInt(100) <= removedEssence)
-//                            {
-//                                user.setHealth((user.getHealth() - 1));
-//
-//                                if (user.getHealth() <= 0.5f)
-//                                {
-//                                    //user.inventory.dropAllItems();
-//                                    user.onDeath(DamageSource.generic);
-//                                    return;
-//                                }
-//                            }
-//                        }
-//                    }
-//                }
-//
-//                //PacketDispatcher.sendPacketToPlayer(PacketHandler.getPacket(ownerName), (Player)user);
-////                data.currentEssence = addedEssence;
-////                data.markDirty();
-//            } catch (IOException e)
-//            {
-//                e.printStackTrace();
-//            }
-//        } else if (packet.channel.equals("InfiniteLPPath"))
-//        {
-//            ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
-//            DataInputStream din = new DataInputStream(bin);
-//
-//            try
-//            {
-//                EntityPlayer user = (EntityPlayer) player;
-//                int length = din.readInt();
-//                String ownerName = "";
-//
-//                for (int i = 0; i < length; i++)
-//                {
-//                    ownerName = ownerName + din.readChar();
-//                }
-//
-//                boolean fill = din.readBoolean();
-//                World world = MinecraftServer.getServer().worldServers[0];
-//                LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName);
-//
-//                if (data == null)
-//                {
-//                    data = new LifeEssenceNetwork(ownerName);
-//                    world.setItemData(ownerName, data);
-//                }
-//
-//                if (fill)
-//                {
-//                    data.currentEssence += 1000000;
-//                    data.markDirty();
-//                } else
-//                {
-//                    data.currentEssence = 0;
-//                    data.markDirty();
-//                }
-//
-//                //PacketDispatcher.sendPacketToPlayer(PacketHandler.getPacket(ownerName), (Player)user);
-////                data.currentEssence = addedEssence;
-////                data.markDirty();
-//            } catch (IOException e)
-//            {
-//                e.printStackTrace();
-//            }
-//        } else if (packet.channel.equals("GetLifeEssence"))
-//        {
-//            ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
-//            DataInputStream din = new DataInputStream(bin);
-//
-//            try
-//            {
-//                int length = din.readInt();
-//                String ownerName = "";
-//
-//                for (int i = 0; i < length; i++)
-//                {
-//                    ownerName = ownerName + din.readChar();
-//                }
-//
-//                World world = MinecraftServer.getServer().worldServers[0];
-//                LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName);
-//
-//                if (data == null)
-//                {
-//                    data = new LifeEssenceNetwork(ownerName);
-//                    world.setItemData(ownerName, data);
-//                }
-//
-//                if (player instanceof EntityPlayer)
-//                {
-//                    EntityPlayer owner = (EntityPlayer) player;
-//                    ChatMessageComponent chatmessagecomponent = new ChatMessageComponent();
-//                    //chatmessagecomponent.func_111072_b("Current Essence: " + data.currentEssence + "LP");
-//                    chatmessagecomponent.addText("Current Essence: " + data.currentEssence + "LP");
-//                    owner.sendChatToPlayer(chatmessagecomponent);
-//                }
-//            } catch (IOException e)
-//            {
-//                e.printStackTrace();
-//            }
-//        } else if (packet.channel.equals("GetAltarEssence"))
-//        {
-//            ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
-//            DataInputStream din = new DataInputStream(bin);
-//
-//            try
-//            {
-//                int x = din.readInt();
-//                int y = din.readInt();
-//                int z = din.readInt();
-//
-//                if (player instanceof EntityPlayer)
-//                {
-//                    EntityPlayer owner = (EntityPlayer) player;
-//                    World world = owner.worldObj;
-//                    TEAltar tileEntity = (TEAltar) world.getBlockTileEntity(x, y, z);
-//
-//                    if (tileEntity != null)
-//                    {
-//                        int level = UpgradedAltars.isAltarValid(world, x, y, z);
-//                        ChatMessageComponent chatmessagecomponent = new ChatMessageComponent();
-//                        chatmessagecomponent.addText("Altar's Current Essence: " + tileEntity.getFluidAmount() + "LP" + "\n" + "Altar's Current Tier: " + level + "\nCapacity: " + tileEntity.getCapacity() + "LP");
-//                        //chatmessagecomponent.addText();
-//                        owner.sendChatToPlayer(chatmessagecomponent);
-//                    }
-//                }
-//            } catch (IOException e)
-//            {
-//                e.printStackTrace();
-//            }
-//        } else if (packet.channel.equals("TESocket"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            int x = dat.readInt();
-//            int y = dat.readInt();
-//            int z = dat.readInt();
-//            boolean hasStacks = dat.readByte() != 0;
-//            int[] items = new int[0];
-//
-//            if (hasStacks)
-//            {
-//                items = new int[1 * 3];
-//
-//                for (int i = 0; i < items.length; i++)
-//                {
-//                    items[i] = dat.readInt();
-//                }
-//            }
-//
-//            World world = AlchemicalWizardry.proxy.getClientWorld();
-//            TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-//
-//            if (tileEntity instanceof TESocket)
-//            {
-//                TESocket tileEntityAltar = (TESocket) tileEntity;
-//                tileEntityAltar.handlePacketData(items);
-//            }
-//        } else if (packet.channel.equals("TEWritingTable"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            int x = dat.readInt();
-//            int y = dat.readInt();
-//            int z = dat.readInt();
-//            boolean hasStacks = dat.readByte() != 0;
-//            int[] items = new int[0];
-//
-//            if (hasStacks)
-//            {
-//                items = new int[7 * 3];
-//
-//                for (int i = 0; i < items.length; i++)
-//                {
-//                    items[i] = dat.readInt();
-//                }
-//            }
-//
-//            World world = AlchemicalWizardry.proxy.getClientWorld();
-//            TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-//
-//            if (tileEntity instanceof TEWritingTable)
-//            {
-//                TEWritingTable tileEntityAltar = (TEWritingTable) tileEntity;
-//                tileEntityAltar.handlePacketData(items);
-//            }
-//        } else if (packet.channel.equals("TEOrientor"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            int x = dat.readInt();
-//            int y = dat.readInt();
-//            int z = dat.readInt();
-//            World world = AlchemicalWizardry.proxy.getClientWorld();
-//            TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-//
-//            if (tileEntity instanceof TEOrientable)
-//            {
-//                TEOrientable tileEntityOrientable = (TEOrientable) tileEntity;
-//                tileEntityOrientable.setInputDirection(ForgeDirection.getOrientation(dat.readInt()));
-//                tileEntityOrientable.setOutputDirection(ForgeDirection.getOrientation(dat.readInt()));
-//                world.markBlockForRenderUpdate(x, y, z);
-//            }
-//        } else if (packet.channel.equals("TEPedestal"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            int x = dat.readInt();
-//            int y = dat.readInt();
-//            int z = dat.readInt();
-//            boolean hasStacks = dat.readByte() != 0;
-//            int[] items = new int[0];
-//
-//            if (hasStacks)
-//            {
-//                items = new int[1 * 3];
-//
-//                for (int i = 0; i < items.length; i++)
-//                {
-//                    items[i] = dat.readInt();
-//                }
-//            }
-//
-//            World world = AlchemicalWizardry.proxy.getClientWorld();
-//            TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-//
-//            if (tileEntity instanceof TEPedestal)
-//            {
-//                TEPedestal tileEntityAltar = (TEPedestal) tileEntity;
-//                tileEntityAltar.handlePacketData(items);
-//            }
-//        } else if (packet.channel.equals("TEPlinth"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            int x = dat.readInt();
-//            int y = dat.readInt();
-//            int z = dat.readInt();
-//            boolean hasStacks = dat.readByte() != 0;
-//            int[] items = new int[0];
-//
-//            if (hasStacks)
-//            {
-//                items = new int[1 * 3];
-//
-//                for (int i = 0; i < items.length; i++)
-//                {
-//                    items[i] = dat.readInt();
-//                }
-//            }
-//
-//            World world = AlchemicalWizardry.proxy.getClientWorld();
-//            TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-//
-//            if (tileEntity instanceof TEPlinth)
-//            {
-//                TEPlinth tileEntityAltar = (TEPlinth) tileEntity;
-//                tileEntityAltar.handlePacketData(items);
-//            }
-//        } else if (packet.channel.equals("TETeleposer"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            int x = dat.readInt();
-//            int y = dat.readInt();
-//            int z = dat.readInt();
-//            boolean hasStacks = dat.readByte() != 0;
-//            int[] items = new int[0];
-//
-//            if (hasStacks)
-//            {
-//                items = new int[1 * 3];
-//
-//                for (int i = 0; i < items.length; i++)
-//                {
-//                    items[i] = dat.readInt();
-//                }
-//            }
-//
-//            World world = AlchemicalWizardry.proxy.getClientWorld();
-//            TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-//
-//            if (tileEntity instanceof TETeleposer)
-//            {
-//                TETeleposer tileEntityAltar = (TETeleposer) tileEntity;
-//                tileEntityAltar.handlePacketData(items);
-//            }
-//        } else if (packet.channel.equals("SetPlayerVel"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            double xVel = dat.readDouble();
-//            double yVel = dat.readDouble();
-//            double zVel = dat.readDouble();
-//            ((EntityPlayer) player).setVelocity(xVel, yVel, zVel);
-//        } else if (packet.channel.equals("SetPlayerPos"))
-//        {
-//            ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
-//            double xVel = dat.readDouble();
-//            double yVel = dat.readDouble();
-//            double zVel = dat.readDouble();
-//            ((EntityPlayer) player).setPosition(xVel, yVel, zVel);
-//        }
-//    }
-//
-//    public static Packet getPacket(TEAltar tileEntity)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//        int[] items = tileEntity.buildIntDataList();
-//        boolean hasStacks = (items != null);
-//
-//        try
-//        {
-//            dos.writeInt(tileEntity.xCoord);
-//            dos.writeInt(tileEntity.yCoord);
-//            dos.writeInt(tileEntity.zCoord);
-//            dos.writeByte(hasStacks ? 1 : 0);
-//
-//            if (hasStacks)
-//            {
-//                for (int i = 0; i < 3; i++)
-//                {
-//                    dos.writeInt(items[i]);
-//                }
-//            }
-//
-//            FluidStack flMain = tileEntity.getFluid();
-//
-//            if (flMain == null)
-//            {
-//                dos.writeInt(AlchemicalWizardry.lifeEssenceFluid.getBlockID());
-//                dos.writeInt(0);
-//            } else
-//            {
-//                dos.writeInt(flMain.fluidID);
-//                dos.writeInt(flMain.amount);
-//            }
-//
-//            FluidStack flOut = tileEntity.getOutputFluid();
-//
-//            if (flOut == null)
-//            {
-//                dos.writeInt(AlchemicalWizardry.lifeEssenceFluid.getBlockID());
-//                dos.writeInt(0);
-//            } else
-//            {
-//                dos.writeInt(flOut.fluidID);
-//                dos.writeInt(flOut.amount);
-//            }
-//
-//            FluidStack flIn = tileEntity.getInputFluid();
-//
-//            if (flIn == null)
-//            {
-//                dos.writeInt(AlchemicalWizardry.lifeEssenceFluid.getBlockID());
-//                dos.writeInt(0);
-//            } else
-//            {
-//                dos.writeInt(flIn.fluidID);
-//                dos.writeInt(flIn.amount);
-//            }
-//
-//            dos.writeInt(tileEntity.capacity);
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "BloodAltar";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getPacket(TESocket tileEntity)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//        int[] items = tileEntity.buildIntDataList();
-//        boolean hasStacks = (items != null);
-//
-//        try
-//        {
-//            dos.writeInt(tileEntity.xCoord);
-//            dos.writeInt(tileEntity.yCoord);
-//            dos.writeInt(tileEntity.zCoord);
-//            dos.writeByte(hasStacks ? 1 : 0);
-//
-//            if (hasStacks)
-//            {
-//                for (int i = 0; i < 3; i++)
-//                {
-//                    dos.writeInt(items[i]);
-//                }
-//            }
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "TESocket";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getPacket(String ownerName, int addedEssence, int maxEssence)
-//    //Packet to be sent to server to change essence
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeInt(ownerName.length());
-//            dos.writeChars(ownerName);
-//            dos.writeInt(addedEssence);
-//            dos.writeInt(maxEssence); //Used for Blood Orbs, but does nothing for other items
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "SetLifeEssence";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        //pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getPacket(String ownerName) //stores the current essence in the player's NBT
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeInt(ownerName.length());
-//            dos.writeChars(ownerName);
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "GetLifeEssence";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        //pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getAltarPacket(int x, int y, int z)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeInt(x);
-//            dos.writeInt(y);
-//            dos.writeInt(z);
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "GetAltarEssence";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        //pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getPacket(TEWritingTable tileEntity)
-//    {
-//        // TODO Auto-generated method stub
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//        int[] items = tileEntity.buildIntDataList();
-//        boolean hasStacks = (items != null);
-//
-//        try
-//        {
-//            dos.writeInt(tileEntity.xCoord);
-//            dos.writeInt(tileEntity.yCoord);
-//            dos.writeInt(tileEntity.zCoord);
-//            dos.writeByte(hasStacks ? 1 : 0);
-//
-//            if (hasStacks)
-//            {
-//                for (int i = 0; i < 3 * 7; i++)
-//                {
-//                    dos.writeInt(items[i]);
-//                }
-//            }
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "TEWritingTable";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getPacket(TEPedestal tileEntity)
-//    {
-//        // TODO Auto-generated method stub
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//        int[] items = tileEntity.buildIntDataList();
-//        boolean hasStacks = (items != null);
-//
-//        try
-//        {
-//            dos.writeInt(tileEntity.xCoord);
-//            dos.writeInt(tileEntity.yCoord);
-//            dos.writeInt(tileEntity.zCoord);
-//            dos.writeByte(hasStacks ? 1 : 0);
-//
-//            if (hasStacks)
-//            {
-//                for (int i = 0; i < 3 * 1; i++)
-//                {
-//                    dos.writeInt(items[i]);
-//                }
-//            }
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "TEPedestal";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getPacket(TEPlinth tileEntity)
-//    {
-//        // TODO Auto-generated method stub
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//        int[] items = tileEntity.buildIntDataList();
-//        boolean hasStacks = (items != null);
-//
-//        try
-//        {
-//            dos.writeInt(tileEntity.xCoord);
-//            dos.writeInt(tileEntity.yCoord);
-//            dos.writeInt(tileEntity.zCoord);
-//            dos.writeByte(hasStacks ? 1 : 0);
-//
-//            if (hasStacks)
-//            {
-//                for (int i = 0; i < 3 * 1; i++)
-//                {
-//                    dos.writeInt(items[i]);
-//                }
-//            }
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "TEPlinth";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getPacket(TETeleposer tileEntity)
-//    {
-//        // TODO Auto-generated method stub
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//        int[] items = tileEntity.buildIntDataList();
-//        boolean hasStacks = (items != null);
-//
-//        try
-//        {
-//            dos.writeInt(tileEntity.xCoord);
-//            dos.writeInt(tileEntity.yCoord);
-//            dos.writeInt(tileEntity.zCoord);
-//            dos.writeByte(hasStacks ? 1 : 0);
-//
-//            if (hasStacks)
-//            {
-//                for (int i = 0; i < 3 * 1; i++)
-//                {
-//                    dos.writeInt(items[i]);
-//                }
-//            }
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "TETeleposer";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-//
-//    public static Packet getCustomParticlePacket(String str, double x, double y, double z, double xVel, double yVel, double zVel)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeInt(str.length());
-//            dos.writeChars(str);
-//            dos.writeDouble(x);
-//            dos.writeDouble(y);
-//            dos.writeDouble(z);
-//            dos.writeDouble(xVel);
-//            dos.writeDouble(yVel);
-//            dos.writeDouble(zVel);
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "CustomParticle";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = false;
-//        return pkt;
-//    }
-//
-//    public static Packet getPlayerVelocitySettingPacket(double xVel, double yVel, double zVel)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeDouble(xVel);
-//            dos.writeDouble(yVel);
-//            dos.writeDouble(zVel);
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "SetPlayerVel";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = false;
-//        return pkt;
-//    }
-//
-//    public static Packet getPlayerPositionSettingPacket(double xVel, double yVel, double zVel)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeDouble(xVel);
-//            dos.writeDouble(yVel);
-//            dos.writeDouble(zVel);
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "SetPlayerPos";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = false;
-//        return pkt;
-//    }
-//
-//    public static Packet getCreativeCheatPacket(String ownerName, boolean isFill)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeInt(ownerName.length());
-//            dos.writeChars(ownerName);
-//            dos.writeBoolean(isFill);
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "InfiniteLPPath";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = false;
-//        return pkt;
-//    }
-//
-//    public static Packet getBlockOrientationPacket(TEOrientable tileEntity)
-//    {
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream(140);
-//        DataOutputStream dos = new DataOutputStream(bos);
-//
-//        try
-//        {
-//            dos.writeInt(tileEntity.xCoord);
-//            dos.writeInt(tileEntity.yCoord);
-//            dos.writeInt(tileEntity.zCoord);
-//            dos.writeInt(tileEntity.getIntForForgeDirection(tileEntity.getInputDirection()));
-//            dos.writeInt(tileEntity.getIntForForgeDirection(tileEntity.getOutputDirection()));
-//        } catch (IOException e)
-//        {
-//            e.printStackTrace();
-//        }
-//
-//        Packet250CustomPayload pkt = new Packet250CustomPayload();
-//        pkt.channel = "TEOrientor";
-//        pkt.data = bos.toByteArray();
-//        pkt.length = bos.size();
-//        pkt.isChunkDataPacket = true;
-//        return pkt;
-//    }
-}

1.7.10/main/java/WayofTime/alchemicalWizardry/common/alchemy/CombinedPotionRegistry.java

@@ -1,13 +1,13 @@
 package WayofTime.alchemicalWizardry.common.alchemy;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper;
-import java.util.List;
+import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper;
+
-import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask;
+import java.util.ArrayList;
+import java.util.List;
 
 public class CombinedPotionRegistry
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/alchemy/ICombinationalCatalyst.java

@@ -2,5 +2,4 @@ package WayofTime.alchemicalWizardry.common.alchemy;
 
 public interface ICombinationalCatalyst
 {
-	
 }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/ArmourForge.java

@@ -1,8 +1,14 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import java.util.List;
+import WayofTime.alchemicalWizardry.ModItems;
-
+import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
+import WayofTime.alchemicalWizardry.common.ArmourComponent;
+import WayofTime.alchemicalWizardry.common.items.BoundArmour;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -14,16 +20,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.ModItems;
+import java.util.ArrayList;
-import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
+import java.util.List;
-import WayofTime.alchemicalWizardry.common.ArmourComponent;
-import WayofTime.alchemicalWizardry.common.items.BoundArmour;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class ArmourForge extends Block
 {
@@ -39,8 +38,6 @@ public class ArmourForge extends Block
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("armourForge");
-        //setUnlocalizedName("armourForge");
-        // TODO Auto-generated constructor stub
     }
 
     @Override
@@ -160,7 +157,6 @@ public class ArmourForge extends Block
 
                 for (int i = 0; i < 8; i++)
                 {
-                    //PacketDispatcher.sendPacketToAllAround(xCoord, yCoord, zCoord, 20, world.provider.dimensionId, TEAltar.getParticlePacket(xCoord, yCoord, zCoord, (short) 1));
                     SpellHelper.sendIndexedParticleToAllAround(world, xCoord, yCoord, zCoord, 20, world.provider.dimensionId, 1, xCoord, yCoord, zCoord);
                 }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockAlchemicCalcinator.java

@@ -1,7 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.Random;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
+import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -12,10 +14,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
+import java.util.Random;
-import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator;
 
 public class BlockAlchemicCalcinator extends BlockContainer
 {
@@ -139,8 +139,7 @@ public class BlockAlchemicCalcinator extends BlockContainer
                     --playerItem.stackSize;
                     tileEntity.setInventorySlotContents(0, newItem);
                 }
-        	}
+            } else if (tileEntity.getStackInSlot(1) == null)
-        	else if(tileEntity.getStackInSlot(1) == null)
             {
                 ItemStack newItem = playerItem.copy();
                 newItem.stackSize = 1;

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java

@@ -1,9 +1,12 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.Random;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.ModItems;
-import javax.swing.Icon;
+import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
-
+import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -15,17 +18,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.ModItems;
+import java.util.Random;
-import WayofTime.alchemicalWizardry.common.PacketHandler;
-import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
-import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockAltar extends BlockContainer
 {
@@ -45,8 +40,6 @@ public class BlockAltar extends BlockContainer
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("bloodAltar");
-        //setUnlocalizedName("blockAltar");
-        //func_111022_d("AlchemicalWizardry:blocks");
     }
 
     @Override
@@ -67,14 +60,8 @@ public class BlockAltar extends BlockContainer
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon2;
         }
@@ -113,8 +100,6 @@ public class BlockAltar extends BlockContainer
     {
         TEAltar tileEntity = (TEAltar) world.getTileEntity(x, y, z);
 
-//        world.scheduleBlockUpdate(x, y, z, this.blockID, 0);
-
         if (tileEntity == null || player.isSneaking())
         {
             return false;
@@ -135,8 +120,7 @@ public class BlockAltar extends BlockContainer
                 }
 
                 return true;
-            }
+            } else if (playerItem.getItem().equals(ModItems.itemSeerSigil))
-            else if(playerItem.getItem().equals(ModItems.itemSeerSigil))
             {
                 if (player.worldObj.isRemote)
                 {
@@ -147,8 +131,7 @@ public class BlockAltar extends BlockContainer
                 }
 
                 return true;
-            }
+            } else if (playerItem.getItem().equals(ModItems.sigilOfHolding))
-            else if (playerItem.getItem().equals(ModItems.sigilOfHolding))
             {
                 ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentItem(playerItem);
 
@@ -163,8 +146,7 @@ public class BlockAltar extends BlockContainer
                     }
 
                     return true;
-                }
+                } else if (item != null && item.getItem().equals(ModItems.itemSeerSigil))
-                else if(item !=null && item.getItem().equals(ModItems.itemSeerSigil))
                 {
                     if (player.worldObj.isRemote)
                     {
@@ -183,27 +165,16 @@ public class BlockAltar extends BlockContainer
         {
             ItemStack newItem = playerItem.copy();
             newItem.stackSize = 1;
-//            if(newItem.getMaxDamage()==0)
-//            {
-//            	newItem.setItemDamage(0);
-//            }
             --playerItem.stackSize;
             tileEntity.setInventorySlotContents(0, newItem);
             tileEntity.startCycle();
         } else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
         {
-            /**stub method
-             * Add the item that is in the slot to the player's inventory, and
-             * then set the slot to null.
-             */
             player.inventory.addItemStackToInventory(tileEntity.getStackInSlot(0));
             tileEntity.setInventorySlotContents(0, null);
             tileEntity.setActive();
         }
-
         world.markBlockForUpdate(x, y, z);
-        //player.openGui(AlchemicalWizardry.instance, 0, world, x, y, z);
-        //PacketDispatcher.sendPacketToServer(tileEntity.getDescriptionPacket());
         return true;
     }
 
@@ -294,18 +265,6 @@ public class BlockAltar extends BlockContainer
         }
     }
 
-//    @Override
-//    public int isProvidingStrongPower(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
-//    {
-//        return 1;
-//    }
-
-//    @Override
-//    public boolean canProvidePower()
-//    {
-//        return true;
-//    }
-
     @Override
     public TileEntity createNewTileEntity(World var1, int var2)
     {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java

@@ -1,7 +1,7 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
@@ -9,12 +9,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import java.util.ArrayList;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
 
 public class BlockBelljar extends BlockContainer
 {
@@ -42,44 +39,6 @@ public class BlockBelljar extends BlockContainer
         }
     }
 
-//	@Override
-//    public void breakBlock(World world, int x, int y, int z, Block par5, int par6)
-//    {
-//        if(world.isRemote)
-//        {
-//        	return;
-//        }
-//		
-//        TileEntity tile = world.getTileEntity(x, y, z);
-//        
-//        if(tile == null)
-//        {
-//        	System.out.println("Tile has been removed already!");
-//        }
-//        
-//        if(tile instanceof TEBellJar)
-//        {
-//        	if(((TEBellJar) tile).areTanksEmpty())
-//        	{
-//        		super.breakBlock(world, x, y, z, par5, par6);
-//        		return;
-//        	}
-//        	System.out.println("Writing...");
-//        	ItemStack droppedStack = new ItemStack(ModBlocks.blockCrystalBelljar);
-//        	droppedStack.setTagCompound(new NBTTagCompound());
-//        	
-//        	NBTTagCompound savedTag = droppedStack.getTagCompound();
-//        	((TEBellJar) tile).writeTankNBT(savedTag); 
-//
-//        	this.dropBlockAsItem(world, x, y, z, droppedStack);
-//        	
-//        	world.removeTileEntity(x, y, z);
-//        	return;
-//        }
-//        
-//        super.breakBlock(world, x, y, z, par5, par6);
-//    }
-	
     @Override
     public TileEntity createNewTileEntity(World world, int meta)
     {
@@ -131,7 +90,6 @@ public class BlockBelljar extends BlockContainer
     public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player)
     {
         this.dropBlockAsItem(world, x, y, z, meta, 0);
-    	
         super.onBlockHarvested(world, x, y, z, meta, player);
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java

@@ -1,8 +1,7 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import cpw.mods.fml.relauncher.Side;
-import java.util.Random;
+import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -10,15 +9,15 @@ import net.minecraft.entity.Entity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
+
-import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
+import java.util.Random;
 
 public class BlockBloodLightSource extends Block
 {
     public BlockBloodLightSource()
     {
         super(Material.cloth);
-        //setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("blockBloodLightSource");
     }
 
@@ -65,7 +64,6 @@ public class BlockBloodLightSource extends Block
     public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity)
     {
         this.setBlockBounds(0.40F, 0.40F, 0.40F, 0.60F, 0.60F, 0.60F);
-        //super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
     }
 
     public int quantityDropped(Random par1Random)

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java

@@ -1,14 +1,14 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockConduit extends BlockOrientable
 {
@@ -28,7 +28,6 @@ public class BlockConduit extends BlockOrientable
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("blockConduit");
-        //func_111022_d("AlchemicalWizardry:blocks");
     }
 
     @Override
@@ -49,14 +48,8 @@ public class BlockConduit extends BlockOrientable
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon2;
         }
@@ -65,7 +58,6 @@ public class BlockConduit extends BlockOrientable
     @Override
     public void breakBlock(World world, int x, int y, int z, Block par5, int par6)
     {
-        //dropItems(world, x, y, z);
         super.breakBlock(world, x, y, z, par5, par6);
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockDemonPortal.java

@@ -1,13 +1,12 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEDemonPortal;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEDemonPortal;
 
 public class BlockDemonPortal extends BlockContainer
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java

@@ -1,5 +1,10 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.items.BlankSpell;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -9,11 +14,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.items.BlankSpell;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockHomHeart extends BlockContainer
 {
@@ -47,14 +47,8 @@ public class BlockHomHeart extends BlockContainer
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon;
         }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java

@@ -1,5 +1,10 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -8,11 +13,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockMasterStone extends BlockContainer
 {
@@ -23,7 +23,6 @@ public class BlockMasterStone extends BlockContainer
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("blockMasterStone");
-        // TODO Auto-generated constructor stub
     }
 
     @Override

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockOrientable.java

@@ -1,20 +1,13 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import javax.swing.Icon;
-
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEOrientable;
-import cpw.mods.fml.relauncher.Side;
+import net.minecraft.block.BlockContainer;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class BlockOrientable extends BlockContainer
 {
@@ -24,16 +17,8 @@ public class BlockOrientable extends BlockContainer
         setHardness(2.0F);
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
-        //setUnlocalizedName("bloodSocket");
-        //func_111022_d("AlchemicalWizardry:blocks");
     }
 
-//    @Override
-//    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
-//    {
-//        return false;
-//    }
-
     @Override
     public TileEntity createNewTileEntity(World world, int dunno)
     {
@@ -118,61 +103,91 @@ public class BlockOrientable extends BlockContainer
             case 0: //BOTTOM
                 switch (output)
                 {
-    		case NORTH: return 2; //UP
+                    case NORTH:
-    		case SOUTH: return 3; //DOWN
+                        return 2; //UP
-    		case EAST: 	return 4; //LEFT
+                    case SOUTH:
-    		case WEST: 	return 5; //RIGHT
+                        return 3; //DOWN
-    		default: 	break;
+                    case EAST:
+                        return 4; //LEFT
+                    case WEST:
+                        return 5; //RIGHT
+                    default:
+                        break;
                 }
                 break;
             case 1: //TOP
                 switch (output)
                 {
-    		case NORTH: return 2; //UP
+                    case NORTH:
-    		case SOUTH: return 3; //DOWN
+                        return 2; //UP
-    		case EAST:	return 5;
+                    case SOUTH:
-    		case WEST:	return 4;
+                        return 3; //DOWN
-    		default: 	break;
+                    case EAST:
+                        return 5;
+                    case WEST:
+                        return 4;
+                    default:
+                        break;
                 }
                 break;
             case 2: //NORTH
                 switch (output)
                 {
-    		case DOWN:	return 3;
+                    case DOWN:
-    		case UP: 	return 2;
+                        return 3;
-    		case EAST:	return 4;
+                    case UP:
-    		case WEST: 	return 5;
+                        return 2;
-    		default: 	break;
+                    case EAST:
+                        return 4;
+                    case WEST:
+                        return 5;
+                    default:
+                        break;
                 }
                 break;
             case 3: //SOUTH
                 switch (output)
                 {
-    		case DOWN:	return 3;
+                    case DOWN:
-    		case UP: 	return 2;
+                        return 3;
-    		case EAST:	return 5;
+                    case UP:
-    		case WEST: 	return 4;
+                        return 2;
-    		default: 	break;
+                    case EAST:
+                        return 5;
+                    case WEST:
+                        return 4;
+                    default:
+                        break;
                 }
                 break;
             case 4: //WEST
                 switch (output)
                 {
-    		case DOWN:	return 3;
+                    case DOWN:
-    		case UP: 	return 2;
+                        return 3;
-    		case NORTH:	return 5;
+                    case UP:
-    		case SOUTH: return 4;
+                        return 2;
-    		default:	break;
+                    case NORTH:
+                        return 5;
+                    case SOUTH:
+                        return 4;
+                    default:
+                        break;
                 }
                 break;
             case 5: //EAST
                 switch (output)
                 {
-    		case DOWN:	return 3;
+                    case DOWN:
-    		case UP: 	return 2;
+                        return 3;
-    		case NORTH:	return 4;
+                    case UP:
-    		case SOUTH: return 5;
+                        return 2;
-    		default: break;
+                    case NORTH:
+                        return 4;
+                    case SOUTH:
+                        return 5;
+                    default:
+                        break;
                 }
                 break;
         }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java

@@ -1,7 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.Random;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -16,10 +18,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
+import java.util.Random;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockPedestal extends BlockContainer
 {
@@ -39,7 +39,6 @@ public class BlockPedestal extends BlockContainer
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("bloodPedestal");
-        //func_111022_d("AlchemicalWizardry:blocks");
     }
 
     @Override
@@ -60,14 +59,8 @@ public class BlockPedestal extends BlockContainer
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon2;
         }
@@ -93,18 +86,11 @@ public class BlockPedestal extends BlockContainer
             tileEntity.setInventorySlotContents(0, newItem);
         } else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
         {
-            /**stub method
-             * Add the item that is in the slot to the player's inventory, and
-             * then set the slot to null.
-             */
             player.inventory.addItemStackToInventory(tileEntity.getStackInSlot(0));
             tileEntity.setInventorySlotContents(0, null);
             tileEntity.setActive();
         }
-
         world.markBlockForUpdate(x, y, z);
-        //player.openGui(AlchemicalWizardry.instance, 0, world, x, y, z);
-        //PacketDispatcher.sendPacketToServer(tileEntity.getDescriptionPacket());
         return true;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java

@@ -1,7 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.Random;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -16,10 +18,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
+import java.util.Random;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockPlinth extends BlockContainer
 {
@@ -39,7 +39,6 @@ public class BlockPlinth extends BlockContainer
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("bloodPlinth");
-        //func_111022_d("AlchemicalWizardry:blocks");
     }
 
     @Override
@@ -60,14 +59,8 @@ public class BlockPlinth extends BlockContainer
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon2;
         }
@@ -93,18 +86,11 @@ public class BlockPlinth extends BlockContainer
             tileEntity.setInventorySlotContents(0, newItem);
         } else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
         {
-            /**stub method
-             * Add the item that is in the slot to the player's inventory, and
-             * then set the slot to null.
-             */
             player.inventory.addItemStackToInventory(tileEntity.getStackInSlot(0));
             tileEntity.setInventorySlotContents(0, null);
             tileEntity.setActive();
         }
-
         world.markBlockForUpdate(x, y, z);
-        //player.openGui(AlchemicalWizardry.instance, 0, world, x, y, z);
-        //PacketDispatcher.sendPacketToServer(tileEntity.getDescriptionPacket());
         return true;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockReagentConduit.java

@@ -1,15 +1,15 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEReagentConduit;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockReagentConduit extends BlockContainer
 {
@@ -41,22 +41,6 @@ public class BlockReagentConduit extends BlockContainer
         return true;
     }
 
-//	@Override
-//	@SideOnly(Side.CLIENT)
-//    public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
-//    {
-//        if (this.equals(ModBlocks.blockSpellParadigm))
-//        {
-//            par3List.add(new ItemStack(par1, 1, 0));
-//            par3List.add(new ItemStack(par1, 1, 1));
-//            par3List.add(new ItemStack(par1, 1, 2));
-//            par3List.add(new ItemStack(par1, 1, 3));
-//        } else
-//        {
-//            super.getSubBlocks(par1, par2CreativeTabs, par3List);
-//        }
-//    }
-	
     @Override
     public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float what, float these, float are)
     {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java

@@ -1,13 +1,12 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.tileEntity.TESchematicSaver;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEDemonPortal;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESchematicSaver;
 
 public class BlockSchematicSaver extends BlockContainer
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java

@@ -1,7 +1,10 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.Random;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
+import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -14,11 +17,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
+import java.util.Random;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockSocket extends BlockContainer
 {
@@ -59,14 +59,8 @@ public class BlockSocket extends BlockContainer
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon2;
         }
@@ -83,7 +77,6 @@ public class BlockSocket extends BlockContainer
         }
 
         ItemStack playerItem = player.getCurrentEquippedItem();
-
         if (tileEntity.getStackInSlot(0) == null && playerItem != null)
         {
             if (playerItem.getItem() instanceof ArmourUpgrade)
@@ -95,18 +88,11 @@ public class BlockSocket extends BlockContainer
             }
         } else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
         {
-            /**stub method
-             * Add the item that is in the slot to the player's inventory, and
-             * then set the slot to null.
-             */
             player.inventory.addItemStackToInventory(tileEntity.getStackInSlot(0));
             tileEntity.setInventorySlotContents(0, null);
             tileEntity.setActive();
         }
-
         world.markBlockForUpdate(x, y, z);
-        //player.openGui(AlchemicalWizardry.instance, 0, world, x, y, z);
-        //PacketDispatcher.sendPacketToServer(tileEntity.getDescriptionPacket());
         return true;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpectralContainer.java

@@ -1,8 +1,8 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer;
-import java.util.Random;
+import cpw.mods.fml.relauncher.Side;
-
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -11,16 +11,15 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralContainer;
+
-import cpw.mods.fml.relauncher.Side;
+import java.util.List;
-import cpw.mods.fml.relauncher.SideOnly;
+import java.util.Random;
 
 public class BlockSpectralContainer extends BlockContainer
 {
     public BlockSpectralContainer()
     {
         super(Material.cloth);
-        //setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("blockSpectralContainer");
         this.setBlockBounds(0, 0, 0, 0, 0, 0);
     }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEffect.java

@@ -1,7 +1,7 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import WayofTime.alchemicalWizardry.ModBlocks;
-
+import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.creativetab.CreativeTabs;
@@ -9,8 +9,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.ModBlocks;
+
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock;
+import java.util.List;
 
 
 public class BlockSpellEffect extends BlockOrientable

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEnhancement.java

@@ -1,7 +1,7 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import WayofTime.alchemicalWizardry.ModBlocks;
-
+import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEnhancementBlock;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.creativetab.CreativeTabs;
@@ -9,10 +9,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.ModBlocks;
+
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock;
+import java.util.List;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEnhancementBlock;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock;
 
 
 public class BlockSpellEnhancement extends BlockOrientable

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellModifier.java

@@ -1,7 +1,7 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import WayofTime.alchemicalWizardry.ModBlocks;
-
+import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.creativetab.CreativeTabs;
@@ -9,9 +9,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.ModBlocks;
+
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock;
+import java.util.List;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock;
 
 
 public class BlockSpellModifier extends BlockOrientable

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellParadigm.java

@@ -1,21 +1,19 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import WayofTime.alchemicalWizardry.ModBlocks;
-
+import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.ModBlocks;
+
-import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal;
+import java.util.List;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockSpellParadigm extends BlockOrientable
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java

@@ -1,7 +1,10 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.Random;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.common.items.TelepositionFocus;
+import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockMobSpawner;
@@ -16,11 +19,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.common.items.TelepositionFocus;
+import java.util.Random;
-import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockTeleposer extends BlockContainer
 {
@@ -40,7 +40,6 @@ public class BlockTeleposer extends BlockContainer
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("bloodTeleposer");
-        //func_111022_d("AlchemicalWizardry:blocks");
     }
 
     @Override
@@ -61,14 +60,8 @@ public class BlockTeleposer extends BlockContainer
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon2;
         }
@@ -97,13 +90,7 @@ public class BlockTeleposer extends BlockContainer
                 return true;
             }
         }
-
         player.openGui(AlchemicalWizardry.instance, 1, world, x, y, z);
-//        this.swapBlocks(world, x, y+1, z, x, y+2, z);
-//
-//        world.markBlockForUpdate(x, y, z);
-        //player.openGui(AlchemicalWizardry.instance, 0, world, x, y, z);
-        //PacketDispatcher.sendPacketToServer(tileEntity.getDescriptionPacket());
         return true;
     }
 
@@ -216,11 +203,6 @@ public class BlockTeleposer extends BlockContainer
         }
 
         //TILES CLEARED
-//    	worldF.destroyBlock(xf, yf, zf, false);
-//    	worldI.destroyBlock(xi, yi, zi, false);
-//    	worldI.setBlockToAir(xi, yi, zi);
-//    	worldF.setBlockToAir(xf, yf, zf);
-        
         worldF.setBlock(xf, yf, zf, initialBlock, metaI, 3);
 
         if (tileEntityI != null)
@@ -230,12 +212,6 @@ public class BlockTeleposer extends BlockContainer
             newTileEntityI.xCoord = xf;
             newTileEntityI.yCoord = yf;
             newTileEntityI.zCoord = zf;
-            
-//            TileEntity tile = worldI.getTileEntity(xf, yf, zf);
-//            if(tile instanceof TileMultipart)
-//            {
-//            	TileMultipart.createFromNBT(nbttag1);
-//            }
         }
 
         worldI.setBlock(xi, yi, zi, finalBlock, metaF, 3);
@@ -247,12 +223,6 @@ public class BlockTeleposer extends BlockContainer
             newTileEntityF.xCoord = xi;
             newTileEntityF.yCoord = yi;
             newTileEntityF.zCoord = zi;
-            
-            TileEntity tile = worldI.getTileEntity(xi, yi, zi);
-//            if(tile instanceof TileMultipart)
-//            {
-//            	TileMultipart.createFromNBT(nbttag2);
-//            }
         }
 
         return true;

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java

@@ -1,8 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import java.util.Random;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
-
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -17,10 +18,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
+import java.util.List;
-import cpw.mods.fml.relauncher.Side;
+import java.util.Random;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockWritingTable extends BlockContainer
 {
@@ -60,14 +60,8 @@ public class BlockWritingTable extends BlockContainer
         {
             case 0:
                 return bottomIcon;
-
             case 1:
                 return topIcon;
-
-            //case 2: return sideIcon1;
-            //case 3: return sideIcon1;
-            //case 4: return sideIcon2;
-            //case 5: return sideIcon2;
             default:
                 return sideIcon2;
         }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java

@@ -1,9 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.List;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-
+import WayofTime.alchemicalWizardry.ModBlocks;
-import javax.swing.Icon;
+import cpw.mods.fml.relauncher.Side;
-
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -11,10 +11,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.ModBlocks;
+import java.util.List;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class BloodRune extends Block
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/BloodStoneBrick.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 
 public class BloodStoneBrick extends Block
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/EfficiencyRune.java

@@ -1,9 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
 
 public class EfficiencyRune extends BloodRune
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/EmptySocket.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 
 public class EmptySocket extends Block
 {
@@ -16,7 +16,6 @@ public class EmptySocket extends Block
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("emptySocket");
-        // TODO Auto-generated constructor stub
     }
 
     @Override

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java

@@ -1,5 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -10,12 +14,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.common.PacketHandler;
-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;
 
 public class ImperfectRitualStone extends Block
 {
@@ -26,7 +24,6 @@ public class ImperfectRitualStone extends Block
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("imperfectRitualStone");
-        // TODO Auto-generated constructor stub
     }
 
     @Override
@@ -39,8 +36,6 @@ public class ImperfectRitualStone extends Block
     @Override
     public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOff, float yOff, float zOff)
     {
-        //ItemStack ist = player.getItemInUse();
-        //if (!world.isRemote)
         {
             Block block = world.getBlock(x, y + 1, z);
 
@@ -54,10 +49,6 @@ public class ImperfectRitualStone extends Block
                 if (!world.isRemote)
                 {
                     world.addWeatherEffect(new EntityLightningBolt(world, x, y + 2, z));
-//                    if (!player.capabilities.isCreativeMode)
-//                    {
-//                        PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(player.getEntityName(), -5000, 0));
-//                    }
                 }
 
                 world.getWorldInfo().setRaining(true);
@@ -78,14 +69,8 @@ public class ImperfectRitualStone extends Block
                     EnergyItems.drainPlayerNetwork(player, 5000);
                 }
 
-                //EntityFallenAngel zomb = new EntityFallenAngel(world);
                 EntityZombie zomb = new EntityZombie(world);
                 zomb.setPosition(x + 0.5, y + 2, z + 0.5);
-                //			zomb.setCurrentItemOrArmor(4, new ItemStack(Item.helmetIron.itemID,1,0));
-                //			zomb.setCurrentItemOrArmor(3, new ItemStack(Item.plateIron.itemID,1,0));
-                //			zomb.setCurrentItemOrArmor(2, new ItemStack(Item.legsIron.itemID,1,0));
-                //			zomb.setCurrentItemOrArmor(1, new ItemStack(Item.bootsIron.itemID,1,0));
-                //zomb.setCurrentItemOrArmor(0, new ItemStack(AlchemicalWizardry.energySword.itemID,1,0));
                 zomb.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2000));
                 zomb.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 20000, 7));
                 zomb.addPotionEffect(new PotionEffect(Potion.resistance.id, 20000, 3));
@@ -94,10 +79,6 @@ public class ImperfectRitualStone extends Block
                 {
                     world.spawnEntityInWorld(zomb);
                     world.addWeatherEffect(new EntityLightningBolt(world, x, y + 2, z));
-//                    if (!player.capabilities.isCreativeMode)
-//                    {
-//                        PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(player.getEntityName(), -5000, 0));
-//                    }
                 }
 
                 return true;
@@ -112,10 +93,6 @@ public class ImperfectRitualStone extends Block
                 {
                     world.addWeatherEffect(new EntityLightningBolt(world, x, y + 2, z));
                     world.setWorldTime((world.getWorldTime() / 24000) * 24000 + 13800);
-//                    if (!player.capabilities.isCreativeMode)
-//                    {
-//                        PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(player.getEntityName(), -5000, 0));
-//                    }
                 }
             } else if (block == Blocks.bedrock)
             {
@@ -127,11 +104,6 @@ public class ImperfectRitualStone extends Block
                 if (!world.isRemote)
                 {
                     world.addWeatherEffect(new EntityLightningBolt(world, x, y + 2, z));
-                    //world.setWorldTime((world.getWorldTime()/24000)*24000+13800);
-//                    if (!player.capabilities.isCreativeMode)
-//                    {
-//                        PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(player.getEntityName(), -5000, 0));
-//                    }
                 }
 
                 player.addPotionEffect(new PotionEffect(Potion.resistance.id, 60 * 20, 1));

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/LargeBloodStoneBrick.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 
 public class LargeBloodStoneBrick extends Block
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java

@@ -1,14 +1,14 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidClassic;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class LifeEssenceBlock extends BlockFluidClassic
 {
@@ -16,8 +16,6 @@ public class LifeEssenceBlock extends BlockFluidClassic
     {
         super(AlchemicalWizardry.lifeEssenceFluid, Material.water);
         AlchemicalWizardry.lifeEssenceFluid.setBlock(this);
-        
-        //setCreativeTab(AlchemicalWizardry.tabBloodMagic);
         this.setBlockName("lifeEssenceFluidBlock");
     }
 
@@ -35,7 +33,6 @@ public class LifeEssenceBlock extends BlockFluidClassic
         this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceStill");
         AlchemicalWizardry.lifeEssenceFluid.setFlowingIcon(blockIcon);
         AlchemicalWizardry.lifeEssenceFluid.setStillIcon(blockIcon);
-        //this.getFluid().setIcons(blockIcon);
     }
 
     @Override

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java

@@ -1,5 +1,10 @@
 package WayofTime.alchemicalWizardry.common.block;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.api.rituals.IRitualStone;
+import WayofTime.alchemicalWizardry.common.items.ScribeTool;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -8,11 +13,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.api.rituals.IRitualStone;
-import WayofTime.alchemicalWizardry.common.items.ScribeTool;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class RitualStone extends Block implements IRitualStone
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/RuneOfSacrifice.java

@@ -1,9 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
 
 public class RuneOfSacrifice extends BloodRune
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/RuneOfSelfSacrifice.java

@@ -1,9 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
 
 public class RuneOfSelfSacrifice extends BloodRune
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java

@@ -1,22 +1,21 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import java.util.Random;
+import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock;
-
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Facing;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock;
+
-import cpw.mods.fml.relauncher.Side;
+import java.util.Random;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class SpectralBlock extends BlockContainer
 {
@@ -26,13 +25,6 @@ public class SpectralBlock extends BlockContainer
         this.setBlockName("spectralBlock");
     }
 
-//	@Override
-//	public int tickRate(World par1World)
-//    {
-//        return 10;
-//    }
-
-
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister iconRegister)
@@ -83,7 +75,6 @@ public class SpectralBlock extends BlockContainer
     @Override
     public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
     {
-        //TEAltar tileEntity = (TEAltar)world.getBlockTileEntity(x, y, z);
         if (player.isSneaking())
         {
             return false;

1.7.10/main/java/WayofTime/alchemicalWizardry/common/block/SpeedRune.java

@@ -1,9 +1,9 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
 
 public class SpeedRune extends BloodRune
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java

@@ -1,14 +1,13 @@
 package WayofTime.alchemicalWizardry.common.bloodAltarUpgrade;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.ModBlocks;
-import java.util.List;
+import WayofTime.alchemicalWizardry.common.block.BloodRune;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+
-import WayofTime.alchemicalWizardry.ModBlocks;
+import java.util.ArrayList;
-import WayofTime.alchemicalWizardry.common.block.BloodRune;
+import java.util.List;
 
 public class UpgradedAltars
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java

@@ -1,16 +1,16 @@
 package WayofTime.alchemicalWizardry.common.demonVillage;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.common.Int3;
-import java.util.List;
+import cpw.mods.fml.common.registry.GameRegistry;
-
+import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import WayofTime.alchemicalWizardry.common.Int3;
+
-import cpw.mods.fml.common.registry.GameRegistry;
+import java.util.ArrayList;
-import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
+import java.util.List;
 
 public class BlockSet
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BuildingSchematic.java

@@ -1,13 +1,13 @@
 package WayofTime.alchemicalWizardry.common.demonVillage;
 
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.ModBlocks;
-import java.util.List;
+import WayofTime.alchemicalWizardry.common.Int3;
-
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import WayofTime.alchemicalWizardry.ModBlocks;
+
-import WayofTime.alchemicalWizardry.common.Int3;
+import java.util.ArrayList;
+import java.util.List;
 
 public class BuildingSchematic
 {
@@ -142,8 +142,6 @@ public class BuildingSchematic
                     world.setBlockToAir(xCoord + pos.xCoord, yCoord + i, zCoord + pos.zCoord);
                 }
             }
-			
-			//grid.destroyAllInGridSpaces(world, xCoord, yCoord + i, zCoord, dir); //Deprecated method
         }
     }
 
@@ -177,7 +175,6 @@ public class BuildingSchematic
                 }
             }
         }
-		
         return max;
     }
 }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonBuilding.java

@@ -1,8 +1,8 @@
 package WayofTime.alchemicalWizardry.common.demonVillage;
 
+import WayofTime.alchemicalWizardry.common.Int3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import WayofTime.alchemicalWizardry.common.Int3;
 
 public class DemonBuilding
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/demonVillage/DemonVillagePath.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.common.demonVillage;
 
+import WayofTime.alchemicalWizardry.ModBlocks;
+import WayofTime.alchemicalWizardry.common.Int3;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import WayofTime.alchemicalWizardry.ModBlocks;
-import WayofTime.alchemicalWizardry.common.Int3;
 
 public class DemonVillagePath
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java

@@ -1,18 +1,13 @@
 package WayofTime.alchemicalWizardry.common.entity.mob;
 
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.*;
-import net.minecraft.entity.ai.EntityAIFollowOwner;
-import net.minecraft.entity.ai.EntityAIHurtByTarget;
-import net.minecraft.entity.ai.EntityAILookIdle;
-import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
-import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
-import net.minecraft.entity.ai.EntityAISwimming;
-import net.minecraft.entity.ai.EntityAIWander;
-import net.minecraft.entity.ai.EntityAIWatchClosest;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.passive.EntityAnimal;
@@ -20,17 +15,12 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class EntityBileDemon extends EntityDemon
 {
@@ -46,22 +36,17 @@ public class EntityBileDemon extends EntityDemon
         this.setSize(1.3F, 2.0F);
         this.getNavigator().setAvoidsWater(true);
         this.tasks.addTask(1, new EntityAISwimming(this));
-        //this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
         this.tasks.addTask(2, new EntityAIAttackOnCollide(this, 1.0D, true));
         this.tasks.addTask(3, this.aiSit);
-        this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+        this.tasks.addTask(4, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(5, new EntityAIWander(this, 1.0D));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
+        this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
+        this.tasks.addTask(7, new EntityAILookIdle(this));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
         attackTimer = 0;
-        //this.isImmuneToFire = true;
     }
 
     @Override
@@ -375,7 +360,6 @@ public class EntityBileDemon extends EntityDemon
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -455,7 +439,6 @@ public class EntityBileDemon extends EntityDemon
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
 import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import net.minecraft.block.BlockColored;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.EntityLivingBase;
@@ -18,7 +17,6 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -28,7 +26,6 @@ import net.minecraft.world.World;
 
 public class EntityBoulderFist extends EntityDemon
 {
-    //private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 40, 40, 15.0F);
     private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
 
     private static float maxTamedHealth = 60.0F;
@@ -44,25 +41,20 @@ public class EntityBoulderFist extends EntityDemon
         this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
         this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, true));
         this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(6, new EntityAIWander(this, 1.0D));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
+        this.tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
+        this.tasks.addTask(8, new EntityAILookIdle(this));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
         this.targetTasks.addTask(4, new EntityAITargetAggro(this, EntityPlayer.class, 0, false));
         this.setAggro(false);
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
 
         if (par1World != null && !par1World.isRemote)
         {
             this.setCombatTask();
         }
-
-        //this.isImmuneToFire = true;
     }
 
     @Override
@@ -80,8 +72,6 @@ public class EntityBoulderFist extends EntityDemon
         {
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
         }
-
-        //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
     }
 
     /**
@@ -121,7 +111,6 @@ public class EntityBoulderFist extends EntityDemon
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
     }
 
     /**
@@ -358,7 +347,6 @@ public class EntityBoulderFist extends EntityDemon
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -438,7 +426,6 @@ public class EntityBoulderFist extends EntityDemon
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java

@@ -1,15 +1,15 @@
 package WayofTime.alchemicalWizardry.common.entity.mob;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.IDemon;
+import WayofTime.alchemicalWizardry.common.items.DemonPlacer;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.passive.EntityTameable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.IDemon;
-import WayofTime.alchemicalWizardry.common.items.DemonPlacer;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class EntityDemon extends EntityTameable implements IDemon
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java

@@ -5,9 +5,7 @@ import WayofTime.alchemicalWizardry.ModItems;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockColored;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.EntityAIAttackOnCollide;
@@ -15,7 +13,6 @@ import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityHorse;
-import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.item.ItemStack;
@@ -30,7 +27,6 @@ import java.util.List;
 
 public class EntityElemental extends EntityDemon
 {
-    //private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 40, 40, 15.0F);
     private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
 
     private static float maxTamedHealth = 100.0F;
@@ -41,15 +37,12 @@ public class EntityElemental extends EntityDemon
         super(par1World, demonID);
         this.setSize(0.5F, 1.0F);
         this.setAggro(false);
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
 
         if (par1World != null && !par1World.isRemote)
         {
             this.setCombatTask();
         }
-
-        //this.isImmuneToFire = true;
     }
 
     public int courseChangeCooldown;
@@ -68,11 +61,6 @@ public class EntityElemental extends EntityDemon
     /**
      * The explosion radius of spawned fireballs.
      */
-    //private int explosionStrength = 1;
-//
-//	private int heightOffsetUpdateTime;
-//	private float heightOffset = 0.5F;
-//	private int field_70846_g;
     protected void dropFewItems(boolean par1, int par2)
     {
         if (worldObj.rand.nextFloat() < (1 - Math.pow(0.6f, par2 + 1)))
@@ -174,12 +162,6 @@ public class EntityElemental extends EntityDemon
 
     protected void updateEntityActionState()
     {
-//        if (!this.worldObj.isRemote && this.worldObj.difficultySetting == 0)
-//        {
-//            this.setDead();
-//        }
-
-        //this.despawnEntity();
         if (this.getHealth() <= this.getMaxHealth() / 2.0f && worldObj.rand.nextInt(200) == 0)
         {
             this.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionReciprocation.id, 100, 1));
@@ -265,10 +247,6 @@ public class EntityElemental extends EntityDemon
             {
                 if (Math.sqrt(d5 * d5 + d6 * d6 + d7 * d7) < 4)
                 {
-//                	if (this.attackCounter == 10)
-//                    {
-//                        this.worldObj.playAuxSFXAtEntity((EntityPlayer)null, 1007, (int)this.posX, (int)this.posY, (int)this.posZ, 0);
-//                    }
                     ++this.attackCounter;
 
                     if (this.attackCounter >= 10)
@@ -369,8 +347,6 @@ public class EntityElemental extends EntityDemon
         {
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
         }
-
-        //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
     }
 
     /**
@@ -410,7 +386,6 @@ public class EntityElemental extends EntityDemon
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
         this.dataWatcher.addObject(25, Byte.valueOf((byte) 0));
     }
 
@@ -546,7 +521,6 @@ public class EntityElemental extends EntityDemon
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -602,7 +576,6 @@ public class EntityElemental extends EntityDemon
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 
@@ -622,7 +595,6 @@ public class EntityElemental extends EntityDemon
             }
 
             return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
-            //return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer)par2EntityLivingBase).func_96122_a((EntityPlayer)par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse)par1EntityLivingBase).func_110248_bS();
         } else
         {
             return false;
@@ -636,7 +608,6 @@ public class EntityElemental extends EntityDemon
     public void setCombatTask()
     {
         this.tasks.removeTask(this.aiAttackOnCollide);
-        //this.tasks.removeTask(this.aiArrowAttack);
         ItemStack itemstack = this.getHeldItem();
         this.tasks.addTask(4, this.aiAttackOnCollide);
     }
@@ -708,7 +679,7 @@ public class EntityElemental extends EntityDemon
     }
 
     @Override
-    public int getTotalArmorValue() //TODO
+    public int getTotalArmorValue()
     {
         return 10;
     }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java

@@ -1,21 +1,12 @@
 package WayofTime.alchemicalWizardry.common.entity.mob;
 
-import net.minecraft.block.BlockColored;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import net.minecraft.entity.Entity;
+import WayofTime.alchemicalWizardry.ModItems;
-import net.minecraft.entity.EntityAgeable;
+import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import net.minecraft.entity.EntityLivingBase;
+import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
-import net.minecraft.entity.IRangedAttackMob;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.*;
-import net.minecraft.entity.ai.EntityAIArrowAttack;
+import net.minecraft.entity.ai.*;
-import net.minecraft.entity.ai.EntityAIAttackOnCollide;
-import net.minecraft.entity.ai.EntityAIFollowOwner;
-import net.minecraft.entity.ai.EntityAIHurtByTarget;
-import net.minecraft.entity.ai.EntityAILookIdle;
-import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
-import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
-import net.minecraft.entity.ai.EntityAISwimming;
-import net.minecraft.entity.ai.EntityAIWander;
-import net.minecraft.entity.ai.EntityAIWatchClosest;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.passive.EntityAnimal;
@@ -29,11 +20,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
 {
@@ -50,20 +36,15 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
         this.getNavigator().setAvoidsWater(true);
         this.tasks.addTask(1, new EntityAISwimming(this));
         this.tasks.addTask(2, this.aiSit);
-        //this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
+        this.tasks.addTask(3, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        //this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, true));
+        this.tasks.addTask(4, new EntityAIWander(this, 1.0D));
-        this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+        this.tasks.addTask(5, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(6, new EntityAILookIdle(this));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
         this.targetTasks.addTask(4, new EntityAITargetAggro(this, EntityPlayer.class, 0, false));
         this.setAggro(false);
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
 
         if (par1World != null && !par1World.isRemote)
@@ -89,8 +70,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
         {
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
         }
-
-        //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
     }
 
     /**
@@ -130,7 +109,6 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
     }
 
     /**

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java

@@ -1,21 +1,12 @@
 package WayofTime.alchemicalWizardry.common.entity.mob;
 
-import net.minecraft.block.BlockColored;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import net.minecraft.entity.Entity;
+import WayofTime.alchemicalWizardry.ModItems;
-import net.minecraft.entity.EntityAgeable;
+import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import net.minecraft.entity.EntityLivingBase;
+import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile;
-import net.minecraft.entity.IRangedAttackMob;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.*;
-import net.minecraft.entity.ai.EntityAIArrowAttack;
+import net.minecraft.entity.ai.*;
-import net.minecraft.entity.ai.EntityAIAttackOnCollide;
-import net.minecraft.entity.ai.EntityAIFollowOwner;
-import net.minecraft.entity.ai.EntityAIHurtByTarget;
-import net.minecraft.entity.ai.EntityAILookIdle;
-import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
-import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
-import net.minecraft.entity.ai.EntityAISwimming;
-import net.minecraft.entity.ai.EntityAIWander;
-import net.minecraft.entity.ai.EntityAIWatchClosest;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.passive.EntityAnimal;
@@ -30,11 +21,6 @@ import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
 {
@@ -48,31 +34,23 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
     {
         super(par1World, AlchemicalWizardry.entityIceDemonID);
         this.setSize(0.5F, 2.0F);
-        //this.getNavigator().setAvoidsWater(true);
         this.tasks.addTask(1, new EntityAISwimming(this));
         this.tasks.addTask(2, this.aiSit);
-        //this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
+        this.tasks.addTask(3, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        //this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, true));
+        this.tasks.addTask(4, new EntityAIWander(this, 1.0D));
-        this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+        this.tasks.addTask(5, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(6, new EntityAILookIdle(this));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
         this.targetTasks.addTask(4, new EntityAITargetAggro(this, EntityPlayer.class, 0, false));
         this.setAggro(false);
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
 
         if (par1World != null && !par1World.isRemote)
         {
             this.setCombatTask();
         }
-
-        //this.isImmuneToFire = true;
     }
 
     @Override
@@ -90,8 +68,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
         {
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
         }
-
-        //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
     }
 
     /**
@@ -131,7 +107,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
     }
 
     /**
@@ -388,7 +363,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -468,7 +442,6 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java

@@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import net.minecraft.block.BlockColored;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.EntityLivingBase;
@@ -17,7 +16,6 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -40,15 +38,12 @@ public class EntityLowerGuardian extends EntityDemon
         this.setSize(0.7F, 1.8F);
         this.getNavigator().setAvoidsWater(true);
         this.tasks.addTask(1, new EntityAISwimming(this));
-        //this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
         this.tasks.addTask(2, new EntityAIAttackOnCollide(this, 1.0D, true));
         this.tasks.addTask(3, this.aiSit);
-        this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+        this.tasks.addTask(4, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(5, new EntityAIWander(this, 1.0D));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
+        this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
+        this.tasks.addTask(7, new EntityAILookIdle(this));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
@@ -56,8 +51,6 @@ public class EntityLowerGuardian extends EntityDemon
         this.setAggro(false);
         this.setTamed(false);
         attackTimer = 0;
-        //isAggro = false;
-        //this.isImmuneToFire = true;
     }
 
     @Override
@@ -75,8 +68,6 @@ public class EntityLowerGuardian extends EntityDemon
         {
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
         }
-
-        //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
     }
 
     /**
@@ -116,7 +107,6 @@ public class EntityLowerGuardian extends EntityDemon
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
     }
 
     /**
@@ -374,7 +364,6 @@ public class EntityLowerGuardian extends EntityDemon
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -454,7 +443,6 @@ public class EntityLowerGuardian extends EntityDemon
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
 import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import net.minecraft.block.BlockColored;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.EntityLivingBase;
@@ -18,7 +17,6 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -28,7 +26,6 @@ import net.minecraft.world.World;
 
 public class EntityShade extends EntityDemon
 {
-    //private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 40, 40, 15.0F);
     private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
 
     private static float maxTamedHealth = 50.0F;
@@ -41,28 +38,22 @@ public class EntityShade extends EntityDemon
         this.getNavigator().setAvoidsWater(true);
         this.tasks.addTask(1, new EntityAISwimming(this));
         this.tasks.addTask(2, this.aiSit);
-        //this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
+        this.tasks.addTask(3, new EntityAIAttackOnCollide(this, 1.0D, true));
-        this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, true));
+        this.tasks.addTask(4, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+        this.tasks.addTask(5, new EntityAIWander(this, 1.0D));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
+        this.tasks.addTask(7, new EntityAILookIdle(this));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
         this.targetTasks.addTask(4, new EntityAITargetAggro(this, EntityPlayer.class, 0, false));
         this.setAggro(false);
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
 
         if (par1World != null && !par1World.isRemote)
         {
             this.setCombatTask();
         }
-
-        //this.isImmuneToFire = true;
     }
 
     @Override
@@ -80,8 +71,6 @@ public class EntityShade extends EntityDemon
         {
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
         }
-
-        //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
     }
 
     /**
@@ -121,7 +110,6 @@ public class EntityShade extends EntityDemon
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
     }
 
     /**
@@ -358,7 +346,6 @@ public class EntityShade extends EntityDemon
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -438,7 +425,6 @@ public class EntityShade extends EntityDemon
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java

@@ -1,20 +1,12 @@
 package WayofTime.alchemicalWizardry.common.entity.mob;
 
-import net.minecraft.entity.Entity;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import net.minecraft.entity.EntityAgeable;
+import WayofTime.alchemicalWizardry.ModItems;
-import net.minecraft.entity.EntityLivingBase;
+import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import net.minecraft.entity.IRangedAttackMob;
+import WayofTime.alchemicalWizardry.common.entity.projectile.MudProjectile;
-import net.minecraft.entity.SharedMonsterAttributes;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import net.minecraft.entity.ai.EntityAIArrowAttack;
+import net.minecraft.entity.*;
-import net.minecraft.entity.ai.EntityAIAttackOnCollide;
+import net.minecraft.entity.ai.*;
-import net.minecraft.entity.ai.EntityAIFollowOwner;
-import net.minecraft.entity.ai.EntityAIHurtByTarget;
-import net.minecraft.entity.ai.EntityAILookIdle;
-import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
-import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
-import net.minecraft.entity.ai.EntityAISwimming;
-import net.minecraft.entity.ai.EntityAIWander;
-import net.minecraft.entity.ai.EntityAIWatchClosest;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.passive.EntityAnimal;
@@ -28,11 +20,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import WayofTime.alchemicalWizardry.common.entity.projectile.MudProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackMob
 {
@@ -49,28 +36,21 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
         this.getNavigator().setAvoidsWater(true);
         this.tasks.addTask(1, new EntityAISwimming(this));
         this.tasks.addTask(2, this.aiSit);
-        //this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
+        this.tasks.addTask(3, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        //this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, true));
+        this.tasks.addTask(4, new EntityAIWander(this, 1.0D));
-        this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+        this.tasks.addTask(5, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(5, new EntityAILookIdle(this));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
         this.targetTasks.addTask(4, new EntityAITargetAggro(this, EntityPlayer.class, 0, false));
         this.setAggro(false);
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
 
         if (par1World != null && !par1World.isRemote)
         {
             this.setCombatTask();
         }
-
-        //this.isImmuneToFire = true;
     }
 
     @Override
@@ -88,8 +68,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
         {
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.maxUntamedHealth);
         }
-
-        //this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(10.0D);
     }
 
     /**
@@ -129,7 +107,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
     }
 
     /**
@@ -365,7 +342,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -445,7 +421,6 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java

@@ -1,21 +1,12 @@
 package WayofTime.alchemicalWizardry.common.entity.mob;
 
-import net.minecraft.block.BlockColored;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import net.minecraft.entity.Entity;
+import WayofTime.alchemicalWizardry.ModItems;
-import net.minecraft.entity.EntityAgeable;
+import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import net.minecraft.entity.EntityLivingBase;
+import WayofTime.alchemicalWizardry.common.entity.projectile.FireProjectile;
-import net.minecraft.entity.IRangedAttackMob;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.*;
-import net.minecraft.entity.ai.EntityAIArrowAttack;
+import net.minecraft.entity.ai.*;
-import net.minecraft.entity.ai.EntityAIAttackOnCollide;
-import net.minecraft.entity.ai.EntityAIFollowOwner;
-import net.minecraft.entity.ai.EntityAIHurtByTarget;
-import net.minecraft.entity.ai.EntityAILookIdle;
-import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
-import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
-import net.minecraft.entity.ai.EntityAISwimming;
-import net.minecraft.entity.ai.EntityAIWander;
-import net.minecraft.entity.ai.EntityAIWatchClosest;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.passive.EntityAnimal;
@@ -23,18 +14,12 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
-import WayofTime.alchemicalWizardry.common.entity.projectile.FireProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackMob
 {
@@ -51,20 +36,15 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
         this.getNavigator().setAvoidsWater(true);
         this.tasks.addTask(1, new EntityAISwimming(this));
         this.tasks.addTask(2, this.aiSit);
-        //this.tasks.addTask(3, new EntityAILeapAtTarget(this, 0.4F));
+        this.tasks.addTask(3, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
-        //this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 1.0D, true));
+        this.tasks.addTask(4, new EntityAIWander(this, 1.0D));
-        this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
+        this.tasks.addTask(5, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        //this.tasks.addTask(6, new EntityAIMate(this, 1.0D));
+        this.tasks.addTask(6, new EntityAILookIdle(this));
-        this.tasks.addTask(7, new EntityAIWander(this, 1.0D));
-        //this.tasks.addTask(8, new EntityAIBeg(this, 8.0F));
-        this.tasks.addTask(9, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
-        this.tasks.addTask(9, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
         this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true));
         this.targetTasks.addTask(4, new EntityAITargetAggro(this, EntityPlayer.class, 0, false));
         this.setAggro(false);
-        //this.targetTasks.addTask(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));
         this.setTamed(false);
 
         if (par1World != null && !par1World.isRemote)
@@ -131,7 +111,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
         super.entityInit();
         this.dataWatcher.addObject(18, new Float(this.getHealth()));
         this.dataWatcher.addObject(19, new Byte((byte) 0));
-        //this.dataWatcher.addObject(20, new Byte((byte) BlockColored.getBlockFromDye(1)));
     }
 
     /**
@@ -367,7 +346,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
     public boolean isBreedingItem(ItemStack par1ItemStack)
     {
         return false;
-        //return par1ItemStack == null ? false : (!(Item.itemsList[par1ItemStack.itemID] instanceof ItemFood) ? false : ((ItemFood)Item.itemsList[par1ItemStack.itemID]).isWolfsFavoriteMeat());
     }
 
     /**
@@ -447,7 +425,6 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
      */
     protected boolean canDespawn()
     {
-        //return !this.isTamed() && this.ticksExisted > 2400;
         return false;
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java

@@ -1,8 +1,8 @@
 package WayofTime.alchemicalWizardry.common.entity.projectile;
 
-import java.util.Iterator;
+import cpw.mods.fml.common.registry.IThrowableEntity;
-import java.util.List;
+import cpw.mods.fml.relauncher.Side;
-
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -11,15 +11,11 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.*;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import cpw.mods.fml.common.registry.IThrowableEntity;
+
-import cpw.mods.fml.relauncher.Side;
+import java.util.Iterator;
-import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
 
 //Shamelessly ripped off from x3n0ph0b3
 public class EnergyBlastProjectile extends Entity implements IProjectile, IThrowableEntity
@@ -252,8 +248,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
 
             if (var18.equals(Block.getBlockById(inTile)) && var19 == inData)
             {
-                // this.groundImpact();
-                // this.setDead();
             }
         } else
         {
@@ -261,7 +255,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
 
             if (ticksInAir > 1 && ticksInAir < 3)
             {
-                //worldObj.spawnParticle("flame", posX + smallGauss(0.1D), posY + smallGauss(0.1D), posZ + smallGauss(0.1D), 0D, 0D, 0D);
                 for (int particles = 0; particles < 3; particles++)
                 {
                     this.doFiringParticles();
@@ -328,7 +321,6 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
             posZ += motionZ;
             MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
             this.setPosition(posX, posY, posZ);
-            //this.doBlockCollisions();
         }
     }
 
@@ -457,12 +449,10 @@ public class EnergyBlastProjectile extends Entity implements IProjectile, IThrow
             this.setDead();
         } else
         {
-            //doDamage(8 + d6(), mop);
             if (mop instanceof EntityLivingBase)
             {
                 ((EntityLivingBase) mop).addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 2));
             }
-
             doDamage(projectileDamage, mop);
             worldObj.createExplosion(shootingEntity, this.posX, this.posY, this.posZ, (float) (0.1), true);
         }

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityBloodLightProjectile.java

@@ -1,13 +1,12 @@
 package WayofTime.alchemicalWizardry.common.entity.projectile;
 
+import WayofTime.alchemicalWizardry.ModBlocks;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.Blocks;
-import net.minecraft.potion.Potion;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.ModBlocks;
 
 
 public class EntityBloodLightProjectile extends EnergyBlastProjectile
@@ -90,8 +89,6 @@ public class EntityBloodLightProjectile extends EnergyBlastProjectile
             {
                 this.worldObj.setBlock(blockX + 1, blockY, blockZ, ModBlocks.blockBloodLight);
             }
-
-            //worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)(0.1), true);
         }
 
         this.setDead();
@@ -106,18 +103,11 @@ public class EntityBloodLightProjectile extends EnergyBlastProjectile
             this.setDead();
         } else
         {
-            //doDamage(8 + d6(), mop);
             if (mop instanceof EntityLivingBase)
             {
-                //((EntityLivingBase)mop).addPotionEffect(new PotionEffect(Potion.weakness.id, 60,2));
-
                 ((EntityLivingBase) mop).setRevengeTarget(shootingEntity);
-
                 doDamage(1, mop);
-
             }
-
-            //worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)(0.1), true);
         }
 
         if (worldObj.isAirBlock((int) this.posX, (int) this.posY, (int) this.posZ))

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaMainProjectile.java

@@ -68,7 +68,6 @@ public class EntityEnergyBazookaMainProjectile extends EnergyBlastProjectile
             this.setDead();
         } else
         {
-            //doDamage(8 + d6(), mop);
             if (mop instanceof EntityLivingBase)
             {
                 spawnSecondaryProjectiles();

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaSecondaryProjectile.java

@@ -195,8 +195,6 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
 
             if (var18.equals(Block.getBlockById(inTile)) && var19 == inData)
             {
-                // this.groundImpact();
-                // this.setDead();
             }
         } else
         {
@@ -204,7 +202,6 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
 
             if (ticksInAir > 1 && ticksInAir < 3)
             {
-                //worldObj.spawnParticle("flame", posX + smallGauss(0.1D), posY + smallGauss(0.1D), posZ + smallGauss(0.1D), 0D, 0D, 0D);
                 for (int particles = 0; particles < 3; particles++)
                 {
                     this.doFiringParticles();
@@ -271,7 +268,6 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
             posZ += motionZ;
             MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ);
             this.setPosition(posX, posY, posZ);
-            //this.doBlockCollisions();
         }
     }
 

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityMeteor.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.common.entity.projectile;
 
+import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
 
 public class EntityMeteor extends EnergyBlastProjectile
 {

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/EntityParticleBeam.java

@@ -1,5 +1,9 @@
 package WayofTime.alchemicalWizardry.common.entity.projectile;
 
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.registry.IThrowableEntity;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.particle.EntityCloudFX;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.entity.Entity;
@@ -9,10 +13,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.registry.IThrowableEntity;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 //Shamelessly ripped off from x3n0ph0b3
 public class EntityParticleBeam extends Entity implements IProjectile, IThrowableEntity
@@ -225,11 +225,9 @@ public class EntityParticleBeam extends Entity implements IProjectile, IThrowabl
         {
             return;
         }
-        //worldObj.spawnParticle("mobSpellAmbient", posX + smallGauss(0.1D), posY + smallGauss(0.1D), posZ + smallGauss(0.1D), 0.5D, 0.5D, 0.5D);
         EntityFX particle = new EntityCloudFX(worldObj, posX, posY, posZ, 0, 0, 0);
         particle.setRBGColorF(colourRed + 0.15f * (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()), colourGreen + 0.15f * (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()), colourBlue + 0.15f * (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()));
         FMLClientHandler.instance().getClient().effectRenderer.addEffect(particle);
-        //worldObj.spawnParticle("happyVillager", posX, posY, posZ, 0, 0, 0);
     }
 
     /**

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/ExplosionProjectile.java

@@ -50,22 +50,8 @@ public class ExplosionProjectile extends EnergyBlastProjectile
             }
 
             worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (2), causesEnvDamage);
-            //this.onImpact(mop.entityHit);
         } else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
         {
-//        	for(int i=-1;i<=1;i++)
-//        	{
-//        		for(int j=-1;j<=1;j++)
-//        		{
-//        			for(int k=-1;k<=1;k++)
-//        			{
-//        				if(worldObj.isAirBlock((int)this.posX+i, (int)this.posY+j, (int)this.posZ+k))
-//        	        	{
-//        	        		worldObj.setBlock( (int)this.posX+i, (int)this.posY+j, (int)this.posZ+k,Block.fire.blockID);
-//        	        	}
-//        			}
-//        		}
-//        	}
             worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (2), causesEnvDamage);
         }
 
@@ -81,12 +67,8 @@ public class ExplosionProjectile extends EnergyBlastProjectile
             this.setDead();
         } else
         {
-            //doDamage(8 + d6(), mop);
             if (mop instanceof EntityLivingBase)
             {
-                //((EntityLivingBase)mop).addPotionEffect(new PotionEffect(Potion.weakness.id, 60,2));
-                //((EntityLivingBase)mop).setFire(50);
-                //((EntityLivingBase)mop).setRevengeTarget(shootingEntity);
                 if (((EntityLivingBase) mop).isImmuneToFire())
                 {
                     doDamage((int) (projectileDamage), mop);
@@ -95,13 +77,10 @@ public class ExplosionProjectile extends EnergyBlastProjectile
                     doDamage(projectileDamage, mop);
                 }
             }
-
-            //worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)(0.1), true);
         }
 
         if (worldObj.isAirBlock((int) this.posX, (int) this.posY, (int) this.posZ))
         {
-            //worldObj.setBlock((int)this.posX, (int)this.posY, (int)this.posZ,Block.fire.blockID);
         }
 
         spawnHitParticles("magicCrit", 8);

1.7.10/main/java/WayofTime/alchemicalWizardry/common/entity/projectile/FireProjectile.java

@@ -1,6 +1,5 @@
 package WayofTime.alchemicalWizardry.common.entity.projectile;
 
-import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.Blocks;
@@ -68,8 +67,6 @@ public class FireProjectile extends EnergyBlastProjectile
                     }
                 }
             }
-
-            //worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)(0.1), true);
         }
 
         this.setDead();
@@ -84,10 +81,8 @@ public class FireProjectile extends EnergyBlastProjectile
             this.setDead();
         } else
         {
-            //doDamage(8 + d6(), mop);
             if (mop instanceof EntityLivingBase)
             {
-                //((EntityLivingBase)mop).addPotionEffect(new PotionEffect(Potion.weakness.id, 60,2));
                 ((EntityLivingBase) mop).setFire(50);
                 ((EntityLivingBase) mop).setRevengeTarget(shootingEntity);
 
@@ -100,8 +95,6 @@ public class FireProjectile extends EnergyBlastProjectile
                     ((EntityLivingBase) mop).hurtResistantTime = 0;
                 }
             }
-
-            //worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)(0.1), true);
         }
 
         if (worldObj.isAirBlock((int) this.posX, (int) this.posY, (int) this.posZ))