Lots of import rearrangement due to odd "clean up" algorithm. Added Crystals, which are very WIP.

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

@@ -1,6 +1,10 @@
 package WayofTime.bloodmagic.api;
 
-import WayofTime.bloodmagic.api.util.helper.LogHelper;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.block.Block;
@@ -9,11 +13,7 @@ import net.minecraft.item.Item;
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import WayofTime.bloodmagic.api.util.helper.LogHelper;
 
 /**
  * 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
@@ -245,6 +245,8 @@ public class Constants
         PATH("BlockPath"),
         DEMON_CRUCIBLE("BlockDemonCrucible"),
         DEMON_PYLON("BlockDemonPylon"),
+        DEMON_CRYSTALLIZER("BlockDemonCrystallizer"),
+        DEMON_CRYSTAL("BlockDemonCrystal"),
         DIMENSIONAL_PORTAL("BlockDimensionalPortal"),
         BLOOD_TANK("BlockBloodTank");
 

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

@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.api;
 
-import WayofTime.bloodmagic.util.helper.TextHelper;
 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;
 
 public class DamageSourceBloodMagic extends DamageSource
 {

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

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

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,16 +1,15 @@
 package WayofTime.bloodmagic.api.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 WayofTime.bloodmagic.tile.TileMasterRitualStone;
 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;
 
 public class RitualEvent extends Event
 {

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.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/IBindable.java

@@ -3,8 +3,6 @@ package WayofTime.bloodmagic.api.iface;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nullable;
-
 /**
  * Implement this interface on any Item that can be bound to a player.
  */

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

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

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

@@ -1,12 +1,6 @@
 package WayofTime.bloodmagic.api.network;
 
-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;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -19,8 +13,13 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldSavedData;
 import net.minecraftforge.common.MinecraftForge;
 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 javax.annotation.Nullable;
+import com.google.common.base.Strings;
 
 @Getter
 @Setter

src/main/java/WayofTime/bloodmagic/api/package-info.java

@@ -1,4 +1,4 @@
 @API(owner = "BloodMagic", provides = "BloodMagic|API", apiVersion = "@VERSION@")
 package WayofTime.bloodmagic.api;
 
-import net.minecraftforge.fml.common.API;
+import net.minecraftforge.fml.common.API;

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

@@ -1,15 +1,16 @@
 package WayofTime.bloodmagic.api.registry;
 
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.altar.EnumAltarTier;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import javax.annotation.Nullable;
+
 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 javax.annotation.Nullable;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 
 public class AltarRecipeRegistry
 {

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

@@ -1,11 +1,16 @@
 package WayofTime.bloodmagic.api.registry;
 
-import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.iface.IHarvestHandler;
+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 java.util.*;
+import WayofTime.bloodmagic.api.BlockStack;
+import WayofTime.bloodmagic.api.iface.IHarvestHandler;
 
 public class HarvestRegistry
 {

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

@@ -1,15 +1,16 @@
 package WayofTime.bloodmagic.api.registry;
 
-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;
 
+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;
+
 public class ImperfectRitualRegistry
 {
     public static final Map<ImperfectRitual, Boolean> enabledRituals = new HashMap<ImperfectRitual, Boolean>();

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

@@ -1,11 +1,9 @@
 package WayofTime.bloodmagic.api.registry;
 
-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;
+
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.item.Item;
@@ -14,10 +12,13 @@ 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import com.google.common.collect.ArrayListMultimap;
 
 /**
  * This is only for those who wish to add a basic {@link BloodOrb}. If you need

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

@@ -1,14 +1,14 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.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,14 +1,12 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import WayofTime.bloodmagic.api.ritual.EnumRuneType;
-import WayofTime.bloodmagic.api.ritual.IRitualStone;
+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 WayofTime.bloodmagic.api.Constants;
+import java.util.Locale;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
-
-import java.util.Locale;
+import WayofTime.bloodmagic.api.Constants;
 
 public enum EnumRuneType implements IStringSerializable
 {

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

@@ -1,12 +1,12 @@
 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

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

@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.api.teleport;
 
+import java.io.Serializable;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import net.minecraft.util.BlockPos;
 
-import java.io.Serializable;
-
 @ToString
 @EqualsAndHashCode
 public class ChunkPairSerializable implements Serializable

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

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

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

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

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

@@ -5,10 +5,10 @@ import java.util.UUID;
 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 WayofTime.bloodmagic.api.iface.IBindable;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 
 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,9 +1,10 @@
 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/PlayerHelper.java

@@ -1,10 +1,8 @@
 package WayofTime.bloodmagic.api.util.helper;
 
-import WayofTime.bloodmagic.api.Constants;
+import java.util.ArrayList;
+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;
@@ -14,9 +12,10 @@ 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 java.util.ArrayList;
-import java.util.UUID;
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
 
 public class PlayerHelper
 {

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

@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.api.util.helper;
 
-import WayofTime.bloodmagic.api.altar.IBloodAltar;
 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.world.World;
+import WayofTime.bloodmagic.api.altar.IBloodAltar;
 
 public class PlayerSacrificeHelper
 {

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

@@ -2,19 +2,18 @@ package WayofTime.bloodmagic.api.util.helper;
 
 import java.util.ArrayList;
 
-import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
 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.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
 
 public class RitualHelper
 {