Allowed Teleposer to move FMP structures

.gitignore

@@ -8,10 +8,17 @@
 /out/
 /asm/
 /bin/
+/build/
+/config/
+crash-reports/
 /.idea/
 /.metadata/
 /.settings/
 /libs/
+/saves/
+/resourcepacks/
+/logs/
+/mods/
 
 # File Extensions
 *.psd
@@ -23,4 +30,6 @@
 
 # Specific files
 Thumbs.db
+usernamechase.json
+options.txt
 

build.gradle

@@ -51,6 +51,7 @@ dependencies {
     compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev"
     compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev"
 	compile name: 'MineTweaker3', version: config.minetweaker_version, ext: 'jar'
+	compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev"
 }
 
 minecraft {

src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java

@@ -5,7 +5,6 @@ import java.util.Set;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 
 public class AltarRecipe
 {

src/main/java/WayofTime/alchemicalWizardry/api/event/PlayerDrainNetworkEvent.java

@@ -1,7 +1,6 @@
 package WayofTime.alchemicalWizardry.api.event;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import cpw.mods.fml.common.eventhandler.Cancelable;
 
 @Cancelable

src/main/java/WayofTime/alchemicalWizardry/api/event/SoulNetworkEvent.java

@@ -1,6 +1,5 @@
 package WayofTime.alchemicalWizardry.api.event;
 
-import net.minecraft.entity.player.EntityPlayer;
 import cpw.mods.fml.common.eventhandler.Event;
 
 public class SoulNetworkEvent extends Event

src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/ComplexNetworkHandler.java

@@ -13,7 +13,6 @@ import java.util.UUID;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.World;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 
 import com.google.gson.Gson;

src/main/java/WayofTime/alchemicalWizardry/api/spell/ComplexSpellEffect.java

@@ -1,6 +1,5 @@
 package WayofTime.alchemicalWizardry.api.spell;
 
-import net.minecraft.nbt.NBTTagCompound;
 
 public abstract class ComplexSpellEffect
 {

src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmProjectile.java

@@ -1,14 +1,13 @@
 package WayofTime.alchemicalWizardry.api.spell;
 
-import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
+import java.util.ArrayList;
-import WayofTime.alchemicalWizardry.common.items.EnergyItems;
+import java.util.List;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
-
+import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-import java.util.ArrayList;
-import java.util.List;
 
 public class SpellParadigmProjectile extends SpellParadigm
 {

src/main/java/WayofTime/alchemicalWizardry/book/compact/Category.java

@@ -2,8 +2,6 @@ package WayofTime.alchemicalWizardry.book.compact;
 
 import net.minecraft.item.ItemStack;
 import WayofTime.alchemicalWizardry.book.enums.EnumType;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class Category {
 	public Category(String name, ItemStack iconStack, EnumType type){

src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryAltarRecipe.java

@@ -11,10 +11,7 @@ import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.oredict.ShapedOreRecipe;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;

src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryItemText.java

@@ -1,16 +1,12 @@
 package WayofTime.alchemicalWizardry.book.entries;
 
-import java.awt.Color;
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 

src/main/java/WayofTime/alchemicalWizardry/book/registries/EntryRegistry.java

@@ -5,7 +5,6 @@ import java.util.HashMap;
 
 import WayofTime.alchemicalWizardry.book.compact.Category;
 import WayofTime.alchemicalWizardry.book.compact.Entry;
-import WayofTime.alchemicalWizardry.book.entries.IEntry;
 
 public class EntryRegistry {
 	public static void registerCategories(Category category){

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

@@ -1,9 +1,7 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import java.util.Random;
-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;
@@ -15,11 +13,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 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 java.util.Random;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockPedestal extends BlockContainer
 {

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

@@ -1,9 +1,7 @@
 package WayofTime.alchemicalWizardry.common.block;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import java.util.Random;
-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;
@@ -15,11 +13,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 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 java.util.Random;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockPlinth extends BlockContainer
 {

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

@@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.block;
 
 import java.util.Random;
 
-import codechicken.multipart.TileMultipart;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockMobSpawner;
@@ -21,6 +20,8 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
 import WayofTime.alchemicalWizardry.common.items.TelepositionFocus;
 import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
+import codechicken.multipart.MultipartHelper;
+import codechicken.multipart.TileMultipart;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -178,10 +179,10 @@ public class BlockTeleposer extends BlockContainer
             return false;
         }
         
-        if(tileEntityF instanceof TileMultipart)
+//        if(tileEntityF instanceof TileMultipart)
-        {
+//        {
-        	((TileMultipart)tileEntityF).createAndLoadEntity(nbttag1);
+//        	((TileMultipart)tileEntityF).createAndLoadEntity(nbttag1);
-        }
+//        }
 
         if (blockI instanceof BlockMobSpawner || blockF instanceof BlockMobSpawner)
         {
@@ -192,6 +193,9 @@ public class BlockTeleposer extends BlockContainer
         int metaF = worldF.getBlockMetadata(xf, yf, zf);
         worldI.playSoundEffect(xi, yi, zi, "mob.endermen.portal", 1.0F, 1.0F);
         worldF.playSoundEffect(xf, yf, zf, "mob.endermen.portal", 1.0F, 1.0F);
+        
+        
+        
         //CLEAR TILES
         Block finalBlock = blockF;
 
@@ -217,10 +221,28 @@ public class BlockTeleposer extends BlockContainer
         if (tileEntityI != null)
         {
             TileEntity newTileEntityI = TileEntity.createAndLoadEntity(nbttag1);
+            
+            if(tileEntityI instanceof TileMultipart)
+        	{
+        		newTileEntityI = MultipartHelper.createTileFromNBT(worldF, nbttag1);
+        	}
+            
             worldF.setTileEntity(xf, yf, zf, newTileEntityI);
+            
             newTileEntityI.xCoord = xf;
             newTileEntityI.yCoord = yf;
             newTileEntityI.zCoord = zf;
+            
+            if(tileEntityI instanceof TileMultipart)
+        	{
+        		MultipartHelper.sendDescPacket(worldF, (TileMultipart)newTileEntityI);
+        	}
+            
+            //worldF.markBlockForUpdate(xf, yf, zf);
+//            if(newTileEntityI instanceof TileMultipart)
+//            {
+//            	MultipartHelper.createTileFromNBT(worldF, nbttag1);
+//            }  
         }
 
         worldI.setBlock(xi, yi, zi, finalBlock, metaF, 3);
@@ -228,10 +250,29 @@ public class BlockTeleposer extends BlockContainer
         if (tileEntityF != null)
         {        	
             TileEntity newTileEntityF = TileEntity.createAndLoadEntity(nbttag2);
+            if(tileEntityF instanceof TileMultipart)
+        	{
+        		newTileEntityF = MultipartHelper.createTileFromNBT(worldI, nbttag2);
+        	}
+            
             worldI.setTileEntity(xi, yi, zi, newTileEntityF);
+            
             newTileEntityF.xCoord = xi;
             newTileEntityF.yCoord = yi;
             newTileEntityF.zCoord = zi;
+            
+            if(tileEntityF instanceof TileMultipart)
+        	{
+        		MultipartHelper.sendDescPacket(worldI, (TileMultipart)newTileEntityF);
+        	}
+            
+            //worldI.markBlockForUpdate(xi, yi, zi);
+//            if(newTileEntityF instanceof TileMultipart)
+//            {
+//            	System.out.println("I am a multipart!");
+//
+//            	MultipartHelper.createTileFromNBT(worldI, nbttag2);
+//            }  
         }
 
         return true;

src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java

@@ -6,8 +6,6 @@ import WayofTime.alchemicalWizardry.ModBlocks;
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.book.compact.Category;
 import WayofTime.alchemicalWizardry.book.compact.Entry;
-import WayofTime.alchemicalWizardry.book.entries.EntryAltarRecipe;
-import WayofTime.alchemicalWizardry.book.entries.EntryCraftingRecipe;
 import WayofTime.alchemicalWizardry.book.entries.EntryImage;
 import WayofTime.alchemicalWizardry.book.entries.EntryItemText;
 import WayofTime.alchemicalWizardry.book.entries.EntryRitualInfo;

src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/ai/EntityDemonAIHurtByTarget.java

@@ -43,19 +43,19 @@ public class EntityDemonAIHurtByTarget extends EntityAIHurtByTarget
         		((TEDemonPortal) portal).notifyDemons(taskOwner, this.taskOwner.getAITarget());
         	}
         	
-//            double d0 = this.getTargetDistance();
+            double d0 = this.getTargetDistance();
-//            List list = this.taskOwner.worldObj.getEntitiesWithinAABB(this.taskOwner.getClass(), AxisAlignedBB.getBoundingBox(this.taskOwner.posX, this.taskOwner.posY, this.taskOwner.posZ, this.taskOwner.posX + 1.0D, this.taskOwner.posY + 1.0D, this.taskOwner.posZ + 1.0D).expand(d0, 10.0D, d0));
+            List list = this.taskOwner.worldObj.getEntitiesWithinAABB(this.taskOwner.getClass(), AxisAlignedBB.getBoundingBox(this.taskOwner.posX, this.taskOwner.posY, this.taskOwner.posZ, this.taskOwner.posX + 1.0D, this.taskOwner.posY + 1.0D, this.taskOwner.posZ + 1.0D).expand(d0, 10.0D, d0));
-//            Iterator iterator = list.iterator();
+            Iterator iterator = list.iterator();
-//
+
-//            while (iterator.hasNext())
+            while (iterator.hasNext())
-//            {
+            {
-//                EntityCreature entitycreature = (EntityCreature)iterator.next();
+                EntityCreature entitycreature = (EntityCreature)iterator.next();
-//
+
-//                if (this.taskOwner != entitycreature && entitycreature.getAttackTarget() == null && !entitycreature.isOnSameTeam(this.taskOwner.getAITarget()))
+                if (this.taskOwner != entitycreature && entitycreature.getAttackTarget() == null && !entitycreature.isOnSameTeam(this.taskOwner.getAITarget()))
-//                {
+                {
-//                    entitycreature.setAttackTarget(this.taskOwner.getAITarget());
+                    entitycreature.setAttackTarget(this.taskOwner.getAITarget());
-//                }
+                }
-//            }
+            }
         }
 
         super.startExecuting();

src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java

@@ -1,11 +1,7 @@
 package WayofTime.alchemicalWizardry.common.items;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import java.util.List;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+
-import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
-import com.google.common.collect.Multimap;
-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;
@@ -25,8 +21,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
 
-import java.util.List;
+import com.google.common.collect.Multimap;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class DaggerOfSacrifice extends EnergyItems
 {

src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java

@@ -1,5 +1,12 @@
 package WayofTime.alchemicalWizardry.common.items.sigil;
 
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.ModBlocks;
 import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding;
@@ -7,14 +14,6 @@ import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightPro
 import WayofTime.alchemicalWizardry.common.items.EnergyItems;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-
-import java.util.List;
 
 public class ItemBloodLightSigil extends EnergyItems implements IHolding
 {

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java

@@ -1,12 +1,10 @@
 package WayofTime.alchemicalWizardry.common.spell.complex.effect;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import java.util.ArrayList;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import java.util.Iterator;
-import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator;
+import java.util.List;
-import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
+import java.util.Random;
-import WayofTime.alchemicalWizardry.api.spell.APISpellHelper;
+
-import WayofTime.alchemicalWizardry.common.NewPacketHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.entity.Entity;
@@ -28,7 +26,6 @@ import net.minecraft.network.play.server.S1FPacketSetExperience;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.server.management.ServerConfigurationManager;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
@@ -36,11 +33,13 @@ import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.oredict.OreDictionary;
-
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import java.util.ArrayList;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-import java.util.Iterator;
+import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator;
-import java.util.List;
+import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-import java.util.Random;
+import WayofTime.alchemicalWizardry.api.spell.APISpellHelper;
+import WayofTime.alchemicalWizardry.common.NewPacketHandler;
+import cpw.mods.fml.common.FMLCommonHandler;
 
 public class SpellHelper
 {

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefaultIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeDefaultIce;
 
 public class CSEMeleeDefaultIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefensiveIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeDefensiveIce;
 
 public class CSEMeleeDefensiveIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeEnvironmentalIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeEnvironmentalIce;
 
 public class CSEMeleeEnvironmentalIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeOffensiveIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeOffensiveIce;
 
 public class CSEMeleeOffensiveIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefaultIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileDefaultIce;
 
 public class CSEProjectileDefaultIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefensiveIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileDefensiveIce;
 
 public class CSEProjectileDefensiveIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileEnvironmentalIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileEnvironmentalIce;
 
 public class CSEProjectileEnvironmentalIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileOffensiveIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileOffensiveIce;
 
 public class CSEProjectileOffensiveIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefaultIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfDefaultIce;
 
 public class CSESelfDefaultIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefensiveIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfDefensiveIce;
 
 public class CSESelfDefensiveIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfEnvironmentalIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfEnvironmentalIce;
 
 public class CSESelfEnvironmentalIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfOffensiveIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfOffensiveIce;
 
 public class CSESelfOffensiveIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefensiveIce.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ToolDefensiveIce;
 
 public class CSEToolDefensiveIce extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolEnvironmentalWind.java

@@ -5,7 +5,6 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ToolEnvironmentalWind;
 
 public class CSEToolEnvironmentalWind extends ComplexSpellEffect

src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeOffensiveFire.java

@@ -1,7 +1,6 @@
 package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.PotionEffect;

src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java

@@ -1,16 +1,7 @@
 package WayofTime.alchemicalWizardry.common.tileEntity;
 
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import java.util.List;
-import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe;
+
-import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
-import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
-import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
-import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
-import WayofTime.alchemicalWizardry.common.NewPacketHandler;
-import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent;
-import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -21,15 +12,28 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.Packet;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.Fluid;
-
+import net.minecraftforge.fluids.FluidContainerRegistry;
-import java.util.List;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
+import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe;
+import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
+import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
+import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
+import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
+import WayofTime.alchemicalWizardry.common.NewPacketHandler;
+import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent;
+import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
+import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 
 public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFluidHandler, IBloodAltar
 {

src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEHomHeart.java

@@ -1,14 +1,12 @@
 package WayofTime.alchemicalWizardry.common.tileEntity;
 
-import WayofTime.alchemicalWizardry.common.spell.simple.HomSpell;
-import WayofTime.alchemicalWizardry.common.spell.simple.HomSpellRegistry;
-import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntitySkull;
 import net.minecraft.world.World;
+import WayofTime.alchemicalWizardry.common.spell.simple.HomSpell;
+import WayofTime.alchemicalWizardry.common.spell.simple.HomSpellRegistry;
 
 public class TEHomHeart extends TileEntity
 {

src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellEffectBlock.java

@@ -3,7 +3,6 @@ package WayofTime.alchemicalWizardry.common.tileEntity;
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType;
 import WayofTime.alchemicalWizardry.api.spell.SpellEffect;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
-import WayofTime.alchemicalWizardry.common.spell.complex.effect.*;
 
 public class TESpellEffectBlock extends TESpellBlock
 {

src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellModifierBlock.java

@@ -2,10 +2,6 @@ package WayofTime.alchemicalWizardry.common.tileEntity;
 
 import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
-import WayofTime.alchemicalWizardry.common.spell.complex.SpellModifierDefault;
-import WayofTime.alchemicalWizardry.common.spell.complex.SpellModifierDefensive;
-import WayofTime.alchemicalWizardry.common.spell.complex.SpellModifierEnvironmental;
-import WayofTime.alchemicalWizardry.common.spell.complex.SpellModifierOffensive;
 
 public class TESpellModifierBlock extends TESpellBlock
 {

src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java

@@ -1,15 +1,14 @@
 package WayofTime.alchemicalWizardry.common.tileEntity;
 
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf;
 import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool;
-import WayofTime.alchemicalWizardry.common.spell.complex.*;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class TESpellParadigmBlock extends TESpellBlock
 {

src/main/java/WayofTime/alchemicalWizardry/common/tweaker/MTHelper.java

@@ -4,7 +4,6 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
 
 import java.util.ArrayList;
 
-import stanhebben.zenscript.annotations.ZenClass;
 import minetweaker.api.item.IIngredient;
 import minetweaker.api.item.IItemStack;
 import minetweaker.api.oredict.IOreDictEntry;

src/main/java/WayofTime/alchemicalWizardry/common/tweaker/MineTweakerIntegration.java

@@ -1,6 +1,5 @@
 package WayofTime.alchemicalWizardry.common.tweaker;
 
-import stanhebben.zenscript.annotations.ZenClass;
 import minetweaker.MineTweakerAPI;
 
 /**