Initial 1.9 commit

This DOES NOT BUILD. Do not even attempt.

Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke.

build.gradle

@@ -3,6 +3,7 @@ buildscript {
         mavenCentral()
         maven { url "http://files.minecraftforge.net/maven" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+		maven { url "http://maven.modmuss50.me" }
     }
     dependencies {
 		classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
@@ -47,6 +48,7 @@ repositories {
     maven { url "http://dvs1.progwml6.com/files/maven" }
     maven {	url "http://mobiusstrip.eu/maven" }
     maven {	url "http://tehnut.info/maven" }
+	maven { url "http://maven.modmuss50.me" }
 	
     ivy {
         name "Thaumcraft"
@@ -59,12 +61,12 @@ repositories {
 }
 
 dependencies {
-    deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}"
+//    deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}"
-    deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}"
+//    deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}"
 
-    compile "mcp.mobius.waila:Waila:${waila_version}_1.8.8:dev"
+//    compile "mcp.mobius.waila:Waila:${waila_version}_1.8.8:dev"
-    compile name: "Thaumcraft", version: "${mc_version}-${thaumcraft_version}", ext: "jar"
+//    compile name: "Thaumcraft", version: "${mc_version}-${thaumcraft_version}", ext: "jar"
-    compile name: 'Baubles', version: "${baubles_version}", ext: 'jar'
+//    compile name: 'Baubles', version: "${baubles_version}", ext: 'jar'
 }
 
 minecraft {

gradle.properties

@@ -1,11 +1,11 @@
 mod_name=BloodMagic
 package_group=com.wayoftime.bloodmagic
 mod_version=2.0.0
-mc_version=1.8.9
+mc_version=1.9
-forge_version=latest
+forge_version=12.16.0.0-1.9
 curse_id=224791
 
-mappings_version=snapshot_20160109
+mappings_version=snapshot_20160312
 
 jei_version=2.27.0.157
 waila_version=1.6.0-B3

src/main/java/WayofTime/bloodmagic/BloodMagic.java

@@ -1,8 +1,14 @@
 package WayofTime.bloodmagic;
 
-import java.io.File;
+import WayofTime.bloodmagic.api.Constants;
-
+import WayofTime.bloodmagic.api.util.helper.LogHelper;
+import WayofTime.bloodmagic.client.gui.GuiHandler;
 import WayofTime.bloodmagic.command.CommandBloodMagic;
+import WayofTime.bloodmagic.compat.ICompatibility;
+import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
+import WayofTime.bloodmagic.proxy.CommonProxy;
+import WayofTime.bloodmagic.registry.*;
+import WayofTime.bloodmagic.util.handler.IMCHandler;
 import lombok.Getter;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -11,22 +17,8 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.*;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
-import WayofTime.bloodmagic.api.Constants;
+
-import WayofTime.bloodmagic.api.util.helper.LogHelper;
+import java.io.File;
-import WayofTime.bloodmagic.client.gui.GuiHandler;
-import WayofTime.bloodmagic.compat.ICompatibility;
-import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
-import WayofTime.bloodmagic.proxy.CommonProxy;
-import WayofTime.bloodmagic.registry.ModArmourTrackers;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModCompatibility;
-import WayofTime.bloodmagic.registry.ModEntities;
-import WayofTime.bloodmagic.registry.ModItems;
-import WayofTime.bloodmagic.registry.ModPotions;
-import WayofTime.bloodmagic.registry.ModRecipes;
-import WayofTime.bloodmagic.registry.ModRituals;
-import WayofTime.bloodmagic.registry.ModTranquilityHandlers;
-import WayofTime.bloodmagic.util.handler.IMCHandler;
 
 @Mod(modid = Constants.Mod.MODID, name = Constants.Mod.NAME, version = Constants.Mod.VERSION, dependencies = Constants.Mod.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.config.ConfigGuiFactory")
 @Getter

src/main/java/WayofTime/bloodmagic/ConfigHandler.java

@@ -1,21 +1,17 @@
 package WayofTime.bloodmagic;
 
-import java.io.File;
+import WayofTime.bloodmagic.api.BlockStack;
-import java.util.ArrayList;
+import WayofTime.bloodmagic.api.BloodMagicAPI;
-import java.util.Arrays;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.HashMap;
+import WayofTime.bloodmagic.util.Utils;
-import java.util.List;
-import java.util.Map;
-
 import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.OreDictionary;
-import WayofTime.bloodmagic.api.BlockStack;
+
-import WayofTime.bloodmagic.api.BloodMagicAPI;
+import java.io.File;
-import WayofTime.bloodmagic.api.Constants;
+import java.util.*;
-import WayofTime.bloodmagic.util.Utils;
 
 public class ConfigHandler
 {

src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.alchemyArray;
 
+import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
+import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer;
 import lombok.Getter;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer;
 
 public class AlchemyArrayEffectBinding extends AlchemyArrayEffect
 {
@@ -61,7 +61,7 @@ public class AlchemyArrayEffectBinding extends AlchemyArrayEffect
             double dispX = distance * Math.sin(angle);
             double dispZ = -distance * Math.cos(angle);
 
-            EntityLightningBolt lightning = new EntityLightningBolt(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ);
+            EntityLightningBolt lightning = new EntityLightningBolt(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ, true);
             world.spawnEntityInWorld(lightning);
         }
     }

src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java

@@ -1,29 +1,9 @@
 package WayofTime.bloodmagic.altar;
 
-import java.util.List;
-
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
 import WayofTime.bloodmagic.api.BlockStack;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.altar.AltarComponent;
+import WayofTime.bloodmagic.api.altar.*;
-import WayofTime.bloodmagic.api.altar.AltarUpgrade;
-import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
-import WayofTime.bloodmagic.api.altar.EnumAltarTier;
-import WayofTime.bloodmagic.api.altar.IAltarComponent;
 import WayofTime.bloodmagic.api.event.AltarCraftedEvent;
 import WayofTime.bloodmagic.api.orb.IBloodOrb;
 import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
@@ -33,9 +13,20 @@ import WayofTime.bloodmagic.block.BlockBloodRune;
 import WayofTime.bloodmagic.block.BlockLifeEssence;
 import WayofTime.bloodmagic.tile.TileAltar;
 import WayofTime.bloodmagic.util.Utils;
-
 import com.google.common.base.Enums;
 import com.google.common.base.Strings;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fluids.*;
+
+import java.util.List;
 
 public class BloodAltar implements IFluidHandler
 {
@@ -296,7 +287,7 @@ public class BloodAltar implements IFluidHandler
     public void startCycle()
     {
         if (tileAltar.getWorld() != null)
-            tileAltar.getWorld().markBlockForUpdate(tileAltar.getPos());
+            tileAltar.markDirty();
 
         checkTier();
 
@@ -364,7 +355,7 @@ public class BloodAltar implements IFluidHandler
             fluidOutputted = Math.min(this.fluid.amount, fluidOutputted);
             this.fluidOutput.amount += fluidOutputted;
             this.fluid.amount -= fluidOutputted;
-            world.markBlockForUpdate(pos);
+            tileAltar.markDirty();
         }
 
         if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive)
@@ -373,7 +364,7 @@ public class BloodAltar implements IFluidHandler
             chargeInputted = Math.min(chargeInputted, maxCharge - totalCharge);
             totalCharge += chargeInputted;
             this.fluid.amount -= chargeInputted;
-            world.markBlockForUpdate(pos);
+            tileAltar.markDirty();
         }
 
         if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0))
@@ -500,7 +491,7 @@ public class BloodAltar implements IFluidHandler
             }
         }
 
-        world.markBlockForUpdate(pos);
+        tileAltar.markDirty();
     }
 
     public void checkTier()
@@ -555,7 +546,7 @@ public class BloodAltar implements IFluidHandler
         if (this.totalCharge > this.maxCharge)
             this.totalCharge = this.maxCharge;
 
-        tileAltar.getWorld().markBlockForUpdate(tileAltar.getPos());
+        tileAltar.markDirty();
     }
 
     public int fillMainTank(int amount)

src/main/java/WayofTime/bloodmagic/api/BlockStack.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.registry.GameData;
 

src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java

@@ -1,10 +1,6 @@
 package WayofTime.bloodmagic.api;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.api.util.helper.LogHelper;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.block.Block;
@@ -13,7 +9,11 @@ import net.minecraft.item.Item;
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import WayofTime.bloodmagic.api.util.helper.LogHelper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * The primary API class. Includes helper methods and blacklists.

src/main/java/WayofTime/bloodmagic/api/Constants.java

@@ -1,13 +1,13 @@
 package WayofTime.bloodmagic.api;
 
-import java.util.Locale;
-
 import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.potion.Potion;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
+import java.util.Locale;
+
 public class Constants
 {
     public static class NBT
@@ -144,7 +144,7 @@ public class Constants
 
     public static class Misc
     {
-        public static final int POTION_ARRAY_SIZE = Potion.potionTypes.length;
+        public static final int POTION_ARRAY_SIZE = 256;
     }
 
     public enum BloodMagicItem

src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.api;
 
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.IChatComponent;
 import WayofTime.bloodmagic.util.helper.TextHelper;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
 
 public class DamageSourceBloodMagic extends DamageSource
 {
@@ -17,8 +17,8 @@ public class DamageSourceBloodMagic extends DamageSource
     }
 
     @Override
-    public IChatComponent getDeathMessage(EntityLivingBase livingBase)
+    public ITextComponent getDeathMessage(EntityLivingBase livingBase)
     {
-        return new ChatComponentText(TextHelper.localizeEffect("chat.BloodMagic.damageSource", livingBase.getName()));
+        return new TextComponentString(TextHelper.localizeEffect("chat.BloodMagic.damageSource", livingBase.getName()));
     }
 }

src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect
 {

src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java

@@ -3,7 +3,7 @@ package WayofTime.bloodmagic.api.alchemyCrafting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
@@ -73,7 +73,7 @@ public class AlchemyCircleRenderer
     public void renderAt(TileEntity tile, double x, double y, double z, float craftTime)
     {
         Tessellator tessellator = Tessellator.getInstance();
-        WorldRenderer wr = tessellator.getWorldRenderer();
+        VertexBuffer wr = tessellator.getBuffer();
 
         GlStateManager.pushMatrix();
         // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 /

src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.api.altar;
 
 import lombok.Getter;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * Used for building the altar structure.

src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java

@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.api.altar;
 
-import java.util.ArrayList;
-
 import lombok.Getter;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.ArrayList;
 
 //@formatter:off
 @Getter

src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java

@@ -1,13 +1,13 @@
 package WayofTime.bloodmagic.api.compress;
 
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
 /**
  * A registry aimed to help compress items in an inventory into its compressible
  * form.

src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java

@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.api.event;
 
+import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
 import lombok.Getter;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.eventhandler.Event;
-import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
 
 /**
  * Fired whenever a craft is completed in a BloodAltar.

src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java

@@ -1,15 +1,14 @@
 package WayofTime.bloodmagic.api.event;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.eventhandler.Cancelable;
-import net.minecraftforge.fml.common.eventhandler.Event;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
 import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.eventhandler.Cancelable;
+import net.minecraftforge.fml.common.eventhandler.Event;
 
 public class RitualEvent extends Event
 {
@@ -51,7 +50,7 @@ public class RitualEvent extends Event
      * This event is called when a Ritual effect is performed. If cancelled, the
      * effect will not happen.
      * 
-     * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos)}
+     * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, net.minecraft.util.math.BlockPos)}
      */
     @Cancelable
     public static class RitualRunEvent extends RitualEvent

src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java

@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.api.event;
 
+import WayofTime.bloodmagic.api.BlockStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.eventhandler.Cancelable;
 import net.minecraftforge.fml.common.eventhandler.Event;
-import WayofTime.bloodmagic.api.BlockStack;
 
 /**
  * Fired when a teleposer attempts to transpose two blocks. Use this to perform

src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.api.iface;
 
-import net.minecraft.util.BlockPos;
-import net.minecraft.world.World;
 import WayofTime.bloodmagic.api.BlockStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 /**
  * Used to define a HarvestHandler for the Harvest Ritual.

src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java

@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.api.iface;
 
-import java.util.List;
-
 import net.minecraft.item.ItemStack;
 
+import java.util.List;
+
 /**
  * This interface is used for items intended to train specific upgrades while
  * held in the player's inventory.

src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.api.incense;
 
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IIncensePath

src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java

@@ -1,13 +1,13 @@
 package WayofTime.bloodmagic.api.incense;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class IncenseTranquilityRegistry
 {
     public static List<TranquilityHandler> handlerList = new ArrayList<TranquilityHandler>();

src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java

@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.api.incense;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public abstract class TranquilityHandler

src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java

@@ -1,12 +1,11 @@
 package WayofTime.bloodmagic.api.livingArmour;
 
+import com.google.common.collect.Multimap;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.google.common.collect.Multimap;
-
 /**
  * An interface this is used purely for internal implementation.
  * 

src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java

@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.api.livingArmour;
 
+import net.minecraft.nbt.NBTTagCompound;
+
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import net.minecraft.nbt.NBTTagCompound;
-
 public class LivingArmourHandler
 {
     public static List<Class<? extends StatTracker>> trackers = new ArrayList<Class<? extends StatTracker>>();

src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java

@@ -1,5 +1,7 @@
 package WayofTime.bloodmagic.api.livingArmour;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +9,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 public abstract class LivingArmourUpgrade
 {
     public static String chatBase = "chat.BloodMagic.livingArmour.upgrade.";

src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java

@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.api.livingArmour;
 
-import java.util.List;
+import WayofTime.bloodmagic.livingArmour.LivingArmour;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.livingArmour.LivingArmour;
+
+import java.util.List;
 
 public abstract class StatTracker
 {

src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java

@@ -1,7 +1,11 @@
 package WayofTime.bloodmagic.api.network;
 
-import javax.annotation.Nullable;
+import WayofTime.bloodmagic.api.BloodMagicAPI;
-
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
+import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
+import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
+import com.google.common.base.Strings;
 import lombok.Getter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
@@ -11,14 +15,10 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldSavedData;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.Event;
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
-import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
-import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 
-import com.google.common.base.Strings;
+import javax.annotation.Nullable;
 
 @Getter
 public class SoulNetwork extends WorldSavedData
@@ -58,10 +58,10 @@ public class SoulNetwork extends WorldSavedData
         if (MinecraftForge.EVENT_BUS.post(event))
             return 0;
 
-        if (MinecraftServer.getServer() == null)
+        if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
             return 0;
 
-        World world = MinecraftServer.getServer().worldServers[0];
+        World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
         SoulNetwork data = (SoulNetwork) world.loadItemData(SoulNetwork.class, event.ownerNetwork);
 
         if (data == null)
@@ -177,7 +177,7 @@ public class SoulNetwork extends WorldSavedData
     {
         if (getPlayer() != null)
         {
-            getPlayer().addPotionEffect(new PotionEffect(Potion.confusion.getId(), 99));
+            getPlayer().addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("confusion"), 99));
         }
     }
 

src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java

@@ -1,11 +1,6 @@
 package WayofTime.bloodmagic.api.recipe;
 
-import java.util.HashMap;
+import WayofTime.bloodmagic.api.orb.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,7 +9,12 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapedRecipes;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
-import WayofTime.bloodmagic.api.orb.IBloodOrb;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * Shaped Blood Orb Recipe Handler by joshie *

src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java

@@ -1,11 +1,6 @@
 package WayofTime.bloodmagic.api.recipe;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.api.orb.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,7 +9,12 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapelessRecipes;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
-import WayofTime.bloodmagic.api.orb.IBloodOrb;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * Shapeless Blood Orb Recipe Handler by joshie *

src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java

@@ -1,17 +1,17 @@
 package WayofTime.bloodmagic.api.recipe;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 public class TartaricForgeRecipe
 {
     protected ItemStack output = null;

src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java

@@ -1,21 +1,19 @@
 package WayofTime.bloodmagic.api.registry;
 
-import java.util.Map.Entry;
+import WayofTime.bloodmagic.api.ItemStackWrapper;
-
+import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
-import javax.annotation.Nullable;
+import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting;
-
+import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.api.ItemStackWrapper;
-import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting;
-import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer;
 
-import com.google.common.collect.BiMap;
+import javax.annotation.Nullable;
-import com.google.common.collect.HashBiMap;
+import java.util.Map.Entry;
 
 public class AlchemyArrayRecipeRegistry
 {

src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java

@@ -1,16 +1,15 @@
 package WayofTime.bloodmagic.api.registry;
 
-import javax.annotation.Nullable;
+import WayofTime.bloodmagic.api.BloodMagicAPI;
-
+import WayofTime.bloodmagic.api.altar.EnumAltarTier;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import net.minecraft.item.ItemStack;
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.altar.EnumAltarTier;
 
-import com.google.common.collect.BiMap;
+import javax.annotation.Nullable;
-import com.google.common.collect.HashBiMap;
 
 public class AltarRecipeRegistry
 {

src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java

@@ -1,16 +1,11 @@
 package WayofTime.bloodmagic.api.registry;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockStem;
 import WayofTime.bloodmagic.api.BlockStack;
 import WayofTime.bloodmagic.api.iface.IHarvestHandler;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockStem;
+
+import java.util.*;
 
 public class HarvestRegistry
 {

src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java

@@ -1,16 +1,15 @@
 package WayofTime.bloodmagic.api.registry;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
 import WayofTime.bloodmagic.api.BlockStack;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
-
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 public class ImperfectRitualRegistry
 {
     public static final Map<ImperfectRitual, Boolean> enabledRituals = new HashMap<ImperfectRitual, Boolean>();

src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java

@@ -1,24 +1,23 @@
 package WayofTime.bloodmagic.api.registry;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.api.BloodMagicAPI;
-import java.util.Collections;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.List;
+import WayofTime.bloodmagic.api.altar.EnumAltarTier;
-
+import WayofTime.bloodmagic.api.orb.BloodOrb;
-import net.minecraft.client.resources.model.ModelBakery;
+import WayofTime.bloodmagic.api.orb.IBloodOrb;
-import net.minecraft.client.resources.model.ModelResourceLocation;
+import com.google.common.collect.ArrayListMultimap;
+import net.minecraft.client.renderer.block.model.ModelBakery;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.altar.EnumAltarTier;
-import WayofTime.bloodmagic.api.orb.BloodOrb;
-import WayofTime.bloodmagic.api.orb.IBloodOrb;
 
-import com.google.common.collect.ArrayListMultimap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * This is only for those who wish to add a basic {@link BloodOrb}. If you need

src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java

@@ -1,15 +1,14 @@
 package WayofTime.bloodmagic.api.registry;
 
+import WayofTime.bloodmagic.api.BloodMagicAPI;
+import WayofTime.bloodmagic.api.ritual.Ritual;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.ritual.Ritual;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 public class RitualRegistry
 {
     public static final Map<Ritual, Boolean> enabledRituals = new HashMap<Ritual, Boolean>();

src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java

@@ -1,13 +1,13 @@
 package WayofTime.bloodmagic.api.registry;
 
+import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
-import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
-
 public class TartaricForgeRecipeRegistry
 {
     private static List<TartaricForgeRecipe> recipeList = new ArrayList<TartaricForgeRecipe>();

src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java

@@ -1,14 +1,15 @@
 package WayofTime.bloodmagic.api.ritual;
 
+
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Consumer;
 
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
-
 public abstract class AreaDescriptor implements Iterator<BlockPos>
 {
     public List<BlockPos> getContainedPositions(BlockPos pos)

src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java

@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import java.util.concurrent.Callable;
-
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
 
+import java.util.concurrent.Callable;
+
 public final class CapabilityRuneType
 {
     public static class RuneTypeStorage implements Capability.IStorage<IRitualStone.Tile>

src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import java.util.Locale;
+import WayofTime.bloodmagic.api.Constants;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
-import WayofTime.bloodmagic.api.Constants;
+
+import java.util.Locale;
 
 public enum EnumRuneType implements IStringSerializable
 {

src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java

@@ -2,8 +2,8 @@ package WayofTime.bloodmagic.api.ritual;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java

@@ -1,9 +1,5 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -11,9 +7,13 @@ import lombok.ToString;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Abstract class for creating new rituals. Rituals need be registered with
  * {@link WayofTime.bloodmagic.api.registry.RitualRegistry#registerRitual(Ritual, String)}

src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java

@@ -2,8 +2,8 @@ package WayofTime.bloodmagic.api.ritual;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * Used to set a {@link EnumRuneType} type to a given {@link BlockPos} for usage

src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.api.ritual.imperfect;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java

@@ -1,12 +1,11 @@
 package WayofTime.bloodmagic.api.ritual.imperfect;
 
+import WayofTime.bloodmagic.api.BlockStack;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.BlockStack;
 
 /**
  * Abstract class for creating new imperfect rituals. ImperfectRituals need be
@@ -40,7 +39,7 @@ public abstract class ImperfectRitual
 
     /**
      * Called when the player activates the ritual
-     * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, BlockPos, ImperfectRitual, EntityPlayer)}
+     * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, EntityPlayer)}
      * 
      * @param imperfectRitualStone
      *        - The {@link IImperfectRitualStone} that the ritual is bound to

src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.api.soul;
 
+import net.minecraft.nbt.NBTTagCompound;
+
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import net.minecraft.nbt.NBTTagCompound;
-
 public class DemonWillHolder
 {
     public HashMap<EnumDemonWillType, Double> willMap = new HashMap<EnumDemonWillType, Double>();

src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.api.soul;
 
-import net.minecraft.util.IStringSerializable;
 import lombok.Getter;
+import net.minecraft.util.IStringSerializable;
 
 @Getter
 public enum EnumDemonWillType implements IStringSerializable

src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.api.soul;
 
-import java.util.List;
-
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 
+import java.util.List;
+
 public interface IDemonWillWeapon
 {
     List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting);

src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java

@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.api.teleport;
 
-import java.io.Serializable;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
+
+import java.io.Serializable;
 
 @ToString
 @EqualsAndHashCode

src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java

@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.api.teleport;
 
-import java.io.Serializable;
+import WayofTime.bloodmagic.api.Constants;
-
 import lombok.Getter;
 import lombok.ToString;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import WayofTime.bloodmagic.api.Constants;
+
+import java.io.Serializable;
 
 @ToString
 public class PortalLocation implements Serializable

src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java

@@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 @ToString
 @EqualsAndHashCode

src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java

@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.api.teleport;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TeleportQueue
 {
     private static TeleportQueue INSTANCE = new TeleportQueue();

src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.api.teleport;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.Teleporter;
 import net.minecraft.world.WorldServer;
 

src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.api.util.helper;
 
-import java.util.UUID;
+import WayofTime.bloodmagic.api.Constants;
-
+import WayofTime.bloodmagic.api.event.ItemBindEvent;
+import WayofTime.bloodmagic.api.iface.IBindable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import WayofTime.bloodmagic.api.Constants;
+
-import WayofTime.bloodmagic.api.event.ItemBindEvent;
+import java.util.UUID;
-import WayofTime.bloodmagic.api.iface.IBindable;
 
 public class BindableHelper
 {

src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.api.util.helper;
 
+import WayofTime.bloodmagic.api.Constants;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
-import WayofTime.bloodmagic.api.Constants;
 
 public class IncenseHelper
 {

src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java

@@ -1,10 +1,9 @@
 package WayofTime.bloodmagic.api.util.helper;
 
+import WayofTime.bloodmagic.api.BloodMagicAPI;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-
 public class LogHelper
 {
     private Logger logger;

src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java

@@ -1,23 +1,23 @@
 package WayofTime.bloodmagic.api.util.helper;
 
-import java.util.UUID;
+import WayofTime.bloodmagic.api.BloodMagicAPI;
-
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
+import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
+import WayofTime.bloodmagic.api.network.SoulNetwork;
 import WayofTime.bloodmagic.api.orb.IBloodOrb;
 import WayofTime.bloodmagic.api.registry.OrbRegistry;
+import com.google.common.base.Strings;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.Event;
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
-import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
-import WayofTime.bloodmagic.api.network.SoulNetwork;
 
-import com.google.common.base.Strings;
+import java.util.UUID;
 
 public class NetworkHelper
 {
@@ -271,10 +271,10 @@ public class NetworkHelper
     @Deprecated
     public static int syphonFromNetwork(String ownerName, int syphon)
     {
-        if (MinecraftServer.getServer() == null)
+        if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
             return 0;
 
-        World world = MinecraftServer.getServer().worldServers[0];
+        World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
         SoulNetwork network = (SoulNetwork) world.loadItemData(SoulNetwork.class, ownerName);
 
         if (network == null)
@@ -308,10 +308,10 @@ public class NetworkHelper
         if (MinecraftForge.EVENT_BUS.post(event))
             return 0;
 
-        if (MinecraftServer.getServer() == null)
+        if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
             return 0;
 
-        World world = MinecraftServer.getServer().worldServers[0];
+        World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
         SoulNetwork data = (SoulNetwork) world.loadItemData(SoulNetwork.class, event.ownerNetwork);
 
         if (data == null)
@@ -337,10 +337,10 @@ public class NetworkHelper
     @Deprecated
     public static int getCurrentEssence(String ownerName)
     {
-        if (MinecraftServer.getServer() == null)
+        if (FMLCommonHandler.instance().getMinecraftServerInstance() == null)
             return 0;
 
-        World world = MinecraftServer.getServer().worldServers[0];
+        World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0];
         SoulNetwork network = (SoulNetwork) world.loadItemData(SoulNetwork.class, ownerName);
 
         if (network == null)

src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.api.util.helper;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.UUID;
+import com.google.common.base.Strings;
-
+import com.google.common.collect.Lists;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
@@ -12,10 +12,9 @@ import net.minecraftforge.common.UsernameCache;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
-import WayofTime.bloodmagic.api.Constants;
 
-import com.google.common.base.Strings;
+import java.util.ArrayList;
-import com.google.common.collect.Lists;
+import java.util.UUID;
 
 public class PlayerHelper
 {
@@ -36,7 +35,7 @@ public class PlayerHelper
         if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
             return null;
 
-        return MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(username);
+        return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUsername(username);
     }
 
     public static EntityPlayer getPlayerFromUUID(String uuid)
@@ -94,6 +93,6 @@ public class PlayerHelper
         if (player == null)
             return;
 
-        player.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
+        player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("confusion"), 80));
     }
 }

src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java

@@ -1,12 +1,13 @@
 package WayofTime.bloodmagic.api.util.helper;
 
+import WayofTime.bloodmagic.api.altar.IBloodAltar;
+import WayofTime.bloodmagic.registry.ModPotions;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.altar.IBloodAltar;
 
 public class PlayerSacrificeHelper
 {
@@ -63,7 +64,7 @@ public class PlayerSacrificeHelper
                 {
                     player.setHealth(maxHealth / 10.0f);
                     setPlayerIncense(player, 0);
-                    player.addPotionEffect(new PotionEffect(soulFrayId.id, soulFrayDuration));
+                    player.addPotionEffect(new PotionEffect(ModPotions.soulFray, soulFrayDuration));
 
                     return true;
                 }

src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java

@@ -1,19 +1,19 @@
 package WayofTime.bloodmagic.api.util.helper;
 
-import java.util.ArrayList;
-
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
 import WayofTime.bloodmagic.api.registry.RitualRegistry;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IRitualStone;
 import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.ritual.RitualComponent;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+
+import java.util.ArrayList;
 
 public class RitualHelper
 {

src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java

@@ -1,8 +1,9 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.List;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.Random;
+import WayofTime.bloodmagic.registry.ModItems;
-
+import WayofTime.bloodmagic.tile.TileAlchemyArray;
+import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -10,18 +11,13 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.*;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumWorldBlockLayer;
-import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
+
-import WayofTime.bloodmagic.registry.ModItems;
+import java.util.List;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
+import java.util.Random;
-import WayofTime.bloodmagic.util.Utils;
 
 public class BlockAlchemyArray extends BlockContainer
 {

src/main/java/WayofTime/bloodmagic/block/BlockAltar.java

@@ -1,6 +1,17 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.api.altar.IAltarManipulator;
+import WayofTime.bloodmagic.api.iface.IAltarReader;
+import WayofTime.bloodmagic.api.iface.IBindable;
+import WayofTime.bloodmagic.api.network.SoulNetwork;
+import WayofTime.bloodmagic.api.orb.IBloodOrb;
+import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TileAltar;
+import WayofTime.bloodmagic.util.Utils;
+import com.google.common.base.Strings;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -10,18 +21,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.altar.IAltarManipulator;
-import WayofTime.bloodmagic.api.iface.IAltarReader;
-import WayofTime.bloodmagic.api.iface.IBindable;
-import WayofTime.bloodmagic.api.network.SoulNetwork;
-import WayofTime.bloodmagic.api.orb.IBloodOrb;
-import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
-import WayofTime.bloodmagic.tile.TileAltar;
-import WayofTime.bloodmagic.util.Utils;
-
-import com.google.common.base.Strings;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java

@@ -1,8 +1,6 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.List;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.Random;
-
 import WayofTime.bloodmagic.registry.ModItems;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -17,7 +15,9 @@ import net.minecraft.util.EnumWorldBlockLayer;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
+
+import java.util.List;
+import java.util.Random;
 
 public class BlockBloodLight extends Block
 {

src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.block;
 
-import WayofTime.bloodmagic.client.IVariantProvider;
-import net.minecraft.block.material.Material;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockString;
+import WayofTime.bloodmagic.client.IVariantProvider;
+import net.minecraft.block.material.Material;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.block;
 
-import WayofTime.bloodmagic.client.IVariantProvider;
-import net.minecraft.block.material.Material;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockString;
+import WayofTime.bloodmagic.client.IVariantProvider;
+import net.minecraft.block.material.Material;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java

@@ -1,8 +1,9 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.BloodMagic;
-import java.util.List;
+import WayofTime.bloodmagic.api.Constants;
-
+import WayofTime.bloodmagic.tile.TileBloodTank;
+import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -18,10 +19,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import WayofTime.bloodmagic.BloodMagic;
+
-import WayofTime.bloodmagic.api.Constants;
+import java.util.ArrayList;
-import WayofTime.bloodmagic.tile.TileBloodTank;
+import java.util.List;
-import WayofTime.bloodmagic.util.Utils;
 
 public class BlockBloodTank extends BlockContainer
 {

src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.block;
 
-import WayofTime.bloodmagic.client.IVariantProvider;
-import net.minecraft.block.material.Material;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockString;
+import WayofTime.bloodmagic.client.IVariantProvider;
+import net.minecraft.block.material.Material;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java

@@ -1,6 +1,12 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.api.soul.IDemonWillGem;
+import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TileDemonCrucible;
+import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -10,12 +16,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.soul.IDemonWillGem;
-import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill;
-import WayofTime.bloodmagic.tile.TileDemonCrucible;
-import WayofTime.bloodmagic.util.Utils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java

@@ -1,8 +1,11 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.List;
+import WayofTime.bloodmagic.BloodMagic;
-import java.util.Random;
+import WayofTime.bloodmagic.api.Constants;
-
+import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
+import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
+import WayofTime.bloodmagic.item.ItemDemonCrystal;
+import WayofTime.bloodmagic.tile.TileDemonCrystal;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -22,17 +25,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.BloodMagic;
+
-import WayofTime.bloodmagic.api.Constants;
+import java.util.List;
-import WayofTime.bloodmagic.api.altar.IAltarManipulator;
+import java.util.Random;
-import WayofTime.bloodmagic.api.iface.IAltarReader;
-import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
-import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
-import WayofTime.bloodmagic.item.ItemComponent;
-import WayofTime.bloodmagic.item.ItemDemonCrystal;
-import WayofTime.bloodmagic.tile.TileAltar;
-import WayofTime.bloodmagic.tile.TileDemonCrystal;
-import WayofTime.bloodmagic.util.Utils;
 
 public class BlockDemonCrystal extends BlockContainer
 {

src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java

@@ -1,6 +1,9 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TileDemonCrystallizer;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
@@ -8,9 +11,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.TileDemonCrystallizer;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java

@@ -1,13 +1,13 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TileDemonPylon;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.TileDemonPylon;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java

@@ -1,8 +1,13 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.Random;
+import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
-
+import WayofTime.bloodmagic.api.teleport.PortalLocation;
+import WayofTime.bloodmagic.api.teleport.TeleportQueue;
+import WayofTime.bloodmagic.block.base.BlockIntegerContainer;
+import WayofTime.bloodmagic.ritual.portal.LocationsHandler;
+import WayofTime.bloodmagic.ritual.portal.Teleports;
+import WayofTime.bloodmagic.tile.TileDimensionalPortal;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
@@ -15,14 +20,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
+
-import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
+import java.util.ArrayList;
-import WayofTime.bloodmagic.api.teleport.PortalLocation;
+import java.util.Random;
-import WayofTime.bloodmagic.api.teleport.TeleportQueue;
-import WayofTime.bloodmagic.block.base.BlockIntegerContainer;
-import WayofTime.bloodmagic.ritual.portal.LocationsHandler;
-import WayofTime.bloodmagic.ritual.portal.Teleports;
-import WayofTime.bloodmagic.tile.TileDimensionalPortal;
 
 public class BlockDimensionalPortal extends BlockIntegerContainer
 {

src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java

@@ -1,15 +1,15 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TileIncenseAltar;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.TileIncenseAltar;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
 
 public class BlockInputRoutingNode extends BlockRoutingNode
 {

src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java

@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode;
+import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode;
-import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
 
 public class BlockItemRoutingNode extends BlockRoutingNode
 {

src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java

@@ -1,7 +1,8 @@
 package WayofTime.bloodmagic.block;
 
-import java.awt.Color;
+import WayofTime.bloodmagic.api.BloodMagicAPI;
-
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.util.helper.TextHelper;
 import lombok.Getter;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.BlockPos;
@@ -11,9 +12,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidClassic;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import WayofTime.bloodmagic.api.BloodMagicAPI;
+
-import WayofTime.bloodmagic.api.Constants;
+import java.awt.*;
-import WayofTime.bloodmagic.util.helper.TextHelper;
 
 public class BlockLifeEssence extends BlockFluidClassic
 {

src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
 
 public class BlockMasterRoutingNode extends BlockRoutingNode
 {

src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
 
 public class BlockOutputRoutingNode extends BlockRoutingNode
 {

src/main/java/WayofTime/bloodmagic/block/BlockPath.java

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.api.incense.IIncensePath;
+import WayofTime.bloodmagic.block.base.BlockString;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.incense.IIncensePath;
-import WayofTime.bloodmagic.block.base.BlockString;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java

@@ -1,5 +1,10 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.block.base.BlockStringContainer;
+import WayofTime.bloodmagic.tile.TilePlinth;
+import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -8,11 +13,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.block.base.BlockStringContainer;
-import WayofTime.bloodmagic.tile.TilePlinth;
-import WayofTime.bloodmagic.util.Utils;
 
 public class BlockPedestal extends BlockStringContainer
 {

src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java

@@ -1,10 +1,9 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.BloodMagic;
-import java.util.List;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.Random;
-
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TilePhantomBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -17,12 +16,13 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.TilePhantomBlock;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 public class BlockPhantom extends BlockContainer implements IVariantProvider
 {
     public BlockPhantom()

src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java

@@ -1,14 +1,5 @@
 package WayofTime.bloodmagic.block;
 
-import WayofTime.bloodmagic.client.IVariantProvider;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.World;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
 import WayofTime.bloodmagic.api.Constants;
@@ -17,10 +8,19 @@ import WayofTime.bloodmagic.api.registry.RitualRegistry;
 import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.util.helper.RitualHelper;
 import WayofTime.bloodmagic.block.base.BlockStringContainer;
+import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.registry.ModItems;
 import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
 import WayofTime.bloodmagic.util.ChatUtil;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.World;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java

@@ -1,16 +1,16 @@
 package WayofTime.bloodmagic.block;
 
-import WayofTime.bloodmagic.client.IVariantProvider;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
-import net.minecraft.world.World;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IRitualStone;
 import WayofTime.bloodmagic.block.base.BlockString;
+import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.registry.ModBlocks;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java

@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -9,7 +10,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumWorldBlockLayer;
 import net.minecraft.world.IBlockAccess;
-import WayofTime.bloodmagic.BloodMagic;
 
 public abstract class BlockRoutingNode extends BlockContainer
 {

src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java

@@ -1,6 +1,9 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TileSoulForge;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -9,9 +12,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.TileSoulForge;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java

@@ -1,10 +1,8 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.api.Constants;
-import java.util.List;
-import java.util.Random;
-
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.tile.TileSpectralBlock;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -17,11 +15,13 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.TileSpectralBlock;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 public class BlockSpectral extends BlockContainer implements IVariantProvider
 {
     public BlockSpectral()

src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java

@@ -1,6 +1,10 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.item.ItemTelepositionFocus;
+import WayofTime.bloodmagic.tile.TileTeleposer;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -10,10 +14,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.item.ItemTelepositionFocus;
-import WayofTime.bloodmagic.tile.TileTeleposer;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 

src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java

@@ -1,5 +1,7 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.Constants;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
@@ -9,8 +11,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 
 public class BlockTestSpellBlock extends Block
 {

src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java

@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.block.base;
 
-import java.util.List;
+import WayofTime.bloodmagic.block.property.UnlistedPropertyInteger;
-
 import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -22,7 +21,8 @@ import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.block.property.UnlistedPropertyInteger;
+
+import java.util.List;
 
 /**
  * Creates a block that has multiple meta-based states.

src/main/java/WayofTime/bloodmagic/block/base/BlockString.java

@@ -1,8 +1,7 @@
 package WayofTime.bloodmagic.block.base;
 
-import java.util.Arrays;
+import WayofTime.bloodmagic.block.property.PropertyString;
-import java.util.List;
+import WayofTime.bloodmagic.block.property.UnlistedPropertyString;
-
 import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -22,8 +21,9 @@ import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.block.property.PropertyString;
+
-import WayofTime.bloodmagic.block.property.UnlistedPropertyString;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Creates a block that has multiple meta-based states.

src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java

@@ -1,14 +1,13 @@
 package WayofTime.bloodmagic.block.property;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import net.minecraft.block.properties.PropertyHelper;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 
-import net.minecraft.block.properties.PropertyHelper;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
 public class PropertyString extends PropertyHelper<String>
 {
     private final ImmutableSet<String> allowedValues;

src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.block.property;
 
+import net.minecraftforge.common.property.IUnlistedProperty;
+
 import java.util.Arrays;
 import java.util.List;
 
-import net.minecraftforge.common.property.IUnlistedProperty;
-
 public class UnlistedPropertyString implements IUnlistedProperty<String>
 {
     private List values;

src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java

@@ -1,10 +1,5 @@
 package WayofTime.bloodmagic.client.gui;
 
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.network.IGuiHandler;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.tile.TileSoulForge;
 import WayofTime.bloodmagic.tile.TileTeleposer;
@@ -14,6 +9,11 @@ import WayofTime.bloodmagic.tile.container.ContainerSoulForge;
 import WayofTime.bloodmagic.tile.container.ContainerTeleposer;
 import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode;
 import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.network.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler
 {

src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java

@@ -1,7 +1,10 @@
 package WayofTime.bloodmagic.client.gui;
 
-import java.io.IOException;
+import WayofTime.bloodmagic.api.Constants;
-
+import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
+import WayofTime.bloodmagic.network.ItemRouterButtonPacketProcessor;
+import WayofTime.bloodmagic.tile.container.ContainerItemRoutingNode;
+import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
@@ -11,11 +14,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
+
-import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
+import java.io.IOException;
-import WayofTime.bloodmagic.network.ItemRouterButtonPacketProcessor;
-import WayofTime.bloodmagic.tile.container.ContainerItemRoutingNode;
-import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode;
 
 @SideOnly(Side.CLIENT)
 public class GuiItemRoutingNode extends GuiContainer

src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java

@@ -1,5 +1,7 @@
 package WayofTime.bloodmagic.client.gui;
 
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -8,8 +10,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode;
 
 @SideOnly(Side.CLIENT)
 public class GuiMasterRoutingNode extends GuiContainer

src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java

@@ -1,5 +1,9 @@
 package WayofTime.bloodmagic.client.gui;
 
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.tile.TileSoulForge;
+import WayofTime.bloodmagic.tile.container.ContainerSoulForge;
+import WayofTime.bloodmagic.util.helper.TextHelper;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -7,10 +11,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.TileSoulForge;
-import WayofTime.bloodmagic.tile.container.ContainerSoulForge;
-import WayofTime.bloodmagic.util.helper.TextHelper;
 
 @SideOnly(Side.CLIENT)
 public class GuiSoulForge extends GuiContainer

src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java

@@ -1,5 +1,8 @@
 package WayofTime.bloodmagic.client.gui;
 
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.tile.container.ContainerTeleposer;
+import WayofTime.bloodmagic.util.helper.TextHelper;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -7,9 +10,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.tile.container.ContainerTeleposer;
-import WayofTime.bloodmagic.util.helper.TextHelper;
 
 @SideOnly(Side.CLIENT)
 public class GuiTeleposer extends GuiContainer

src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.client.gui.config;
 
-import java.util.ArrayList;
+import WayofTime.bloodmagic.ConfigHandler;
-import java.util.List;
+import WayofTime.bloodmagic.api.Constants;
-
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.common.config.ConfigElement;
 import net.minecraftforge.fml.client.config.GuiConfig;
 import net.minecraftforge.fml.client.config.IConfigElement;
-import WayofTime.bloodmagic.ConfigHandler;
+
-import WayofTime.bloodmagic.api.Constants;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ConfigGui extends GuiConfig
 {