Merge apibutnotreally with the main packages

Do not consider anything outside of the true API safe to use. And even then,
I'm changing things. Just wait. Please I beg you.

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

@@ -3,9 +3,9 @@ package WayofTime.bloodmagic;
 import WayofTime.bloodmagic.api.BloodMagicPlugin;
 import WayofTime.bloodmagic.api.IBloodMagicPlugin;
 import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
-import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
-import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper;
+import WayofTime.bloodmagic.core.registry.OrbRegistry;
+import WayofTime.bloodmagic.core.registry.RitualRegistry;
+import WayofTime.bloodmagic.util.helper.LogHelper;
 import WayofTime.bloodmagic.client.gui.GuiHandler;
 import WayofTime.bloodmagic.command.CommandBloodMagic;
 import WayofTime.bloodmagic.core.RegistrarBloodMagic;

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

@@ -1,6 +1,6 @@
-package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting;
+package WayofTime.bloodmagic.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
+import WayofTime.bloodmagic.iface.IAlchemyArray;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;

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

@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.alchemyArray;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
 import WayofTime.bloodmagic.fakePlayer.FakePlayerBM;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import com.mojang.authlib.GameProfile;

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

@@ -1,7 +1,5 @@
 package WayofTime.bloodmagic.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting;
 import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.item.EntityItem;

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

@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
+import WayofTime.bloodmagic.iface.IAlchemyArray;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting;
+package WayofTime.bloodmagic.alchemyArray;
 
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting;
+package WayofTime.bloodmagic.alchemyArray;
 
 import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
 import net.minecraft.entity.item.EntityItem;

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

@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
+import WayofTime.bloodmagic.iface.IAlchemyArray;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;

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

@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.apibutnotreally.iface.ISigil;
+import WayofTime.bloodmagic.iface.ISigil;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 

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

@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import com.google.common.base.Predicate;
 import net.minecraft.entity.EntityLiving;

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

@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray;
+import WayofTime.bloodmagic.iface.IAlchemyArray;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting;
+package WayofTime.bloodmagic.alchemyArray;
 
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import net.minecraft.client.Minecraft;

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.altar;
+package WayofTime.bloodmagic.altar;
 
 import net.minecraft.util.math.BlockPos;
 

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.altar;
+package WayofTime.bloodmagic.altar;
 
 public class AltarUpgrade {
     private int speedCount;

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

@@ -3,12 +3,11 @@ package WayofTime.bloodmagic.altar;
 import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent;
 import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
-import WayofTime.bloodmagic.apibutnotreally.BlockStack;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
-import WayofTime.bloodmagic.apibutnotreally.altar.*;
-import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb;
-import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper;
+import WayofTime.bloodmagic.util.BlockStack;
+import WayofTime.bloodmagic.util.Constants;
+import WayofTime.bloodmagic.orb.BloodOrb;
+import WayofTime.bloodmagic.orb.IBloodOrb;
+import WayofTime.bloodmagic.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.block.BlockBloodRune;
 import WayofTime.bloodmagic.block.BlockLifeEssence;
 import WayofTime.bloodmagic.tile.TileAltar;

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.altar;
+package WayofTime.bloodmagic.altar;
 
 import java.util.Locale;
 

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.altar;
+package WayofTime.bloodmagic.altar;
 
 import net.minecraft.util.math.BlockPos;
 

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.altar;
+package WayofTime.bloodmagic.altar;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.altar;
+package WayofTime.bloodmagic.altar;
 
 /**
  * Any item that implements this interface will not be pulled into the Altar on

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.altar;
+package WayofTime.bloodmagic.altar;
 
 public interface IBloodAltar {
     int getCapacity();

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

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.api.impl;
 
 import WayofTime.bloodmagic.api.IBloodMagicAPI;
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent;
+import WayofTime.bloodmagic.altar.EnumAltarComponent;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import net.minecraft.block.state.IBlockState;

src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java

@@ -5,7 +5,7 @@ import WayofTime.bloodmagic.ConfigHandler;
 import WayofTime.bloodmagic.api.BloodMagicPlugin;
 import WayofTime.bloodmagic.api.IBloodMagicAPI;
 import WayofTime.bloodmagic.api.IBloodMagicPlugin;
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent;
+import WayofTime.bloodmagic.altar.EnumAltarComponent;
 import WayofTime.bloodmagic.block.BlockBloodRune;
 import WayofTime.bloodmagic.block.BlockDecorative;
 import WayofTime.bloodmagic.block.enums.EnumBloodRune;

src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java

@@ -5,7 +5,7 @@ import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
-import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb;
+import WayofTime.bloodmagic.orb.IBloodOrb;
 import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;

src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.api.impl.recipe;
 
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier;
+import WayofTime.bloodmagic.altar.EnumAltarTier;
 import com.google.common.base.Preconditions;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;

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

@@ -1,6 +0,0 @@
-@Deprecated // This entire "api" is going to be nuked over time. Consider all of this unstable.
-@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION)
-package WayofTime.bloodmagic.apibutnotreally;
-
-import WayofTime.bloodmagic.BloodMagic;
-import net.minecraftforge.fml.common.API;

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

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable;
 import WayofTime.bloodmagic.tile.TileAlchemyTable;
 import net.minecraft.block.Block;

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

@@ -2,16 +2,16 @@ package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.altar.BloodAltar;
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent;
-import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator;
-import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar;
-import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader;
-import WayofTime.bloodmagic.apibutnotreally.iface.IBindable;
-import WayofTime.bloodmagic.apibutnotreally.iface.IDocumentedBlock;
-import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb;
-import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb;
-import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper;
+import WayofTime.bloodmagic.altar.EnumAltarComponent;
+import WayofTime.bloodmagic.altar.IAltarManipulator;
+import WayofTime.bloodmagic.altar.IBloodAltar;
+import WayofTime.bloodmagic.iface.IAltarReader;
+import WayofTime.bloodmagic.iface.IBindable;
+import WayofTime.bloodmagic.iface.IDocumentedBlock;
+import WayofTime.bloodmagic.orb.BloodOrb;
+import WayofTime.bloodmagic.orb.IBloodOrb;
+import WayofTime.bloodmagic.core.data.SoulNetwork;
+import WayofTime.bloodmagic.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileAltar;
 import WayofTime.bloodmagic.util.Utils;

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

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem;
-import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill;
+import WayofTime.bloodmagic.soul.IDemonWillGem;
+import WayofTime.bloodmagic.soul.IDiscreteDemonWill;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileDemonCrucible;
 import WayofTime.bloodmagic.util.Utils;

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

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
-import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler;
+import WayofTime.bloodmagic.soul.EnumDemonWillType;
+import WayofTime.bloodmagic.soul.PlayerDemonWillHandler;
 import WayofTime.bloodmagic.tile.TileDemonCrystal;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

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

@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone;
-import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation;
-import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue;
+import WayofTime.bloodmagic.ritual.data.IMasterRitualStone;
+import WayofTime.bloodmagic.teleport.PortalLocation;
+import WayofTime.bloodmagic.teleport.TeleportQueue;
 import WayofTime.bloodmagic.block.base.BlockInteger;
 import WayofTime.bloodmagic.ritual.portal.LocationsHandler;
 import WayofTime.bloodmagic.ritual.portal.Teleports;

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

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.BlockRenderLayer;

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

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent;
-import WayofTime.bloodmagic.apibutnotreally.altar.IAltarComponent;
+import WayofTime.bloodmagic.altar.EnumAltarComponent;
+import WayofTime.bloodmagic.altar.IAltarComponent;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.block.enums.EnumMimic;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks;

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

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -1,13 +1,13 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.BlockStack;
-import WayofTime.bloodmagic.apibutnotreally.iface.IBindable;
-import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry;
-import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry;
-import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual;
-import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper;
+import WayofTime.bloodmagic.util.BlockStack;
+import WayofTime.bloodmagic.iface.IBindable;
+import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry;
+import WayofTime.bloodmagic.core.registry.RitualRegistry;
+import WayofTime.bloodmagic.ritual.data.Ritual;
+import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual;
+import WayofTime.bloodmagic.util.helper.RitualHelper;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.block.enums.EnumRitualController;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;

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

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType;
-import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone;
+import WayofTime.bloodmagic.ritual.data.EnumRuneType;
+import WayofTime.bloodmagic.ritual.data.IRitualStone;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.util.helper.TextHelper;

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

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileSoulForge;
 import net.minecraft.block.Block;

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

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.item.ItemTelepositionFocus;
 import WayofTime.bloodmagic.tile.TileTeleposer;

src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.block.enums;
 
-import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
+import WayofTime.bloodmagic.soul.EnumDemonWillType;
 import net.minecraft.util.IStringSerializable;
 
 import java.util.Locale;

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

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.gui;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.item.inventory.ContainerHolding;
 import WayofTime.bloodmagic.item.inventory.InventoryHolding;
 import WayofTime.bloodmagic.tile.TileAlchemyTable;

src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.client.hud;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
+import WayofTime.bloodmagic.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.proxy.ClientProxy;
 import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.client.Minecraft;

src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.client.mesh;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable;
+import WayofTime.bloodmagic.iface.IActivatable;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;

src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.client.mesh;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool;
-import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
+import WayofTime.bloodmagic.iface.IMultiWillTool;
+import WayofTime.bloodmagic.soul.EnumDemonWillType;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;

src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.client.mesh;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
+import WayofTime.bloodmagic.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.item.soul.ItemSoulGem;
 import net.minecraft.client.renderer.ItemMeshDefinition;

src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.render.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.render.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;

src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.render.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.render.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.render.alchemyArray;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java

@@ -2,8 +2,8 @@ package WayofTime.bloodmagic.client.render.block;
 
 import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;

src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.client.render.block;
 
-import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent;
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier;
+import WayofTime.bloodmagic.altar.AltarComponent;
+import WayofTime.bloodmagic.altar.EnumAltarTier;
 import WayofTime.bloodmagic.block.BlockLifeEssence;
 import WayofTime.bloodmagic.tile.TileAltar;
 import WayofTime.bloodmagic.util.handler.event.ClientHandler;

src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java

@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.client.render.block;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.apibutnotreally.iface.INodeRenderer;
+import WayofTime.bloodmagic.iface.INodeRenderer;
 import WayofTime.bloodmagic.client.helper.ShaderHelper;
 import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
 import net.minecraft.client.Minecraft;

src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java

@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.command.sub;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
-import WayofTime.bloodmagic.apibutnotreally.iface.IBindable;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.BindableHelper;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper;
+import WayofTime.bloodmagic.util.Constants;
+import WayofTime.bloodmagic.iface.IBindable;
+import WayofTime.bloodmagic.util.helper.BindableHelper;
+import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import com.google.common.base.Strings;
 import net.minecraft.command.CommandBase;

src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.command.sub;
 
-import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper;
+import WayofTime.bloodmagic.core.data.SoulNetwork;
+import WayofTime.bloodmagic.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.command.CommandBloodMagic;
 import WayofTime.bloodmagic.util.Utils;
 import WayofTime.bloodmagic.util.helper.TextHelper;

src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.command.sub;
 
-import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper;
+import WayofTime.bloodmagic.core.data.SoulNetwork;
+import WayofTime.bloodmagic.util.helper.NetworkHelper;
+import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.command.CommandBloodMagic;
 import WayofTime.bloodmagic.util.Utils;
 import WayofTime.bloodmagic.util.helper.TextHelper;

src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.guideapi;
 
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
-import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
 import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer;
 import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray;
 import amerifrance.guideapi.page.PageIRecipe;

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.guideapi.book;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe;
+import WayofTime.bloodmagic.recipe.TartaricForgeRecipe;
 import WayofTime.bloodmagic.compat.guideapi.BookUtils;
 import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
 import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray;

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java

@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.compat.guideapi.book;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe;
-import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe;
-import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
+import WayofTime.bloodmagic.recipe.TartaricForgeRecipe;
+import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe;
+import WayofTime.bloodmagic.core.registry.OrbRegistry;
 import WayofTime.bloodmagic.compat.guideapi.BookUtils;
 import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
 import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray;

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.guideapi.book;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe;
+import WayofTime.bloodmagic.recipe.TartaricForgeRecipe;
 import WayofTime.bloodmagic.compat.guideapi.BookUtils;
 import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
 import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe;

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.compat.guideapi.book;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe;
-import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType;
+import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe;
+import WayofTime.bloodmagic.ritual.data.EnumRuneType;
 import WayofTime.bloodmagic.compat.guideapi.BookUtils;
 import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
 import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe;

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.guideapi.book;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
 import net.minecraft.util.ResourceLocation;
 

src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.guideapi.page;
 
-import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper;
-import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry;
+import WayofTime.bloodmagic.util.ItemStackWrapper;
+import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import amerifrance.guideapi.api.impl.Book;
 import amerifrance.guideapi.api.impl.Page;

src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.guideapi.page;
 
-import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe;
-import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
+import WayofTime.bloodmagic.recipe.TartaricForgeRecipe;
+import WayofTime.bloodmagic.core.registry.OrbRegistry;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import amerifrance.guideapi.api.impl.Book;
 import amerifrance.guideapi.api.impl.Page;

src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java

@@ -4,9 +4,9 @@ import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
 import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
-import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades;
+import WayofTime.bloodmagic.util.Constants;
+import WayofTime.bloodmagic.livingArmour.LivingArmourHandler;
+import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades;
 import WayofTime.bloodmagic.client.gui.GuiSoulForge;
 import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory;
 import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI;

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.alchemyArray;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.IDrawable;

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.compat.jei.alchemyTable;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
-import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
+import WayofTime.bloodmagic.util.Constants;
+import WayofTime.bloodmagic.core.registry.OrbRegistry;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.ICraftingGridHelper;

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.jei.alchemyTable;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import mezz.jei.api.recipe.IRecipeHandler;
 import mezz.jei.api.recipe.IRecipeWrapper;
 

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.jei.alchemyTable;
 
-import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe;
+import WayofTime.bloodmagic.recipe.AlchemyTableRecipe;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import com.google.common.collect.Lists;

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.alchemyTable;
 
-import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe;
-import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry;
+import WayofTime.bloodmagic.recipe.AlchemyTableRecipe;
+import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;

src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.altar;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.IDrawable;

src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.armourDowngrade;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.ICraftingGridHelper;

src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.jei.armourDowngrade;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import mezz.jei.api.recipe.IRecipeHandler;
 import mezz.jei.api.recipe.IRecipeWrapper;
 

src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.armourDowngrade;
 
-import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades;
+import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe;
+import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
 import com.google.common.collect.Lists;

src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.armourDowngrade;
 
-import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe;
-import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry;
+import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe;
+import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;

src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.binding;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.IDrawable;

src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.jei.binding;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import mezz.jei.api.recipe.IRecipeHandler;
 import mezz.jei.api.recipe.IRecipeWrapper;
 

src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java

@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.compat.jei.binding;
 
 import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding;
-import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper;
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry;
+import WayofTime.bloodmagic.util.ItemStackWrapper;
+import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect;
+import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
 import com.google.common.collect.BiMap;
 import net.minecraft.item.ItemStack;
 

src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.jei.forge;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mezz.jei.api.gui.ICraftingGridHelper;

src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.waila;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.compat.waila.provider.*;
 import WayofTime.bloodmagic.tile.*;
 import mcp.mobius.waila.api.IWailaPlugin;

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.waila.provider;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java

@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.compat.waila.provider;
 
 import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.item.sigil.ItemSigilDivination;
 import WayofTime.bloodmagic.item.sigil.ItemSigilSeer;

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.waila.provider;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.tile.TileBloodTank;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import mcp.mobius.waila.api.IWailaConfigHandler;

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java

@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.compat.waila.provider;
 
-import WayofTime.bloodmagic.apibutnotreally.BlockStack;
-import WayofTime.bloodmagic.apibutnotreally.Constants;
-import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry;
-import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry;
-import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper;
+import WayofTime.bloodmagic.util.BlockStack;
+import WayofTime.bloodmagic.util.Constants;
+import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry;
+import WayofTime.bloodmagic.core.registry.RitualRegistry;
+import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual;
+import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import joptsimple.internal.Strings;

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java

@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.compat.waila.provider;
 
-import WayofTime.bloodmagic.apibutnotreally.Constants;
+import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.item.ItemTelepositionFocus;
 import WayofTime.bloodmagic.tile.TileTeleposer;
 import WayofTime.bloodmagic.util.helper.TextHelper;

src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java

@@ -1,7 +1,5 @@
 package WayofTime.bloodmagic.compress;
 
-import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler;
-import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.InventoryCrafting;

src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java

@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.compress;
 
-import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 

src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.compress;
+package WayofTime.bloodmagic.compress;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

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

@@ -1,4 +1,4 @@
-package WayofTime.bloodmagic.apibutnotreally.compress;
+package WayofTime.bloodmagic.compress;
 
 import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.item.ItemStack;

src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java

@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.compress;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.InventoryCrafting;

src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.core;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb;
-import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
+import WayofTime.bloodmagic.orb.BloodOrb;
+import WayofTime.bloodmagic.core.registry.OrbRegistry;
 import WayofTime.bloodmagic.entity.mob.*;
 import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
 import WayofTime.bloodmagic.entity.projectile.EntityMeteor;

src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java

@@ -2,10 +2,10 @@ package WayofTime.bloodmagic.core;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar;
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier;
-import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
-import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType;
-import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType;
+import WayofTime.bloodmagic.altar.EnumAltarTier;
+import WayofTime.bloodmagic.core.registry.OrbRegistry;
+import WayofTime.bloodmagic.ritual.data.EnumRuneType;
+import WayofTime.bloodmagic.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.block.BlockLifeEssence;
 import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid;
 import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade;

src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java

@@ -1,6 +1,6 @@
-package WayofTime.bloodmagic.apibutnotreally.saving;
+package WayofTime.bloodmagic.core.data;
 
-import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper;
+import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;

src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java

@@ -1,9 +1,9 @@
-package WayofTime.bloodmagic.apibutnotreally.saving;
+package WayofTime.bloodmagic.core.data;
 
-import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI;
-import WayofTime.bloodmagic.apibutnotreally.event.AddToNetworkEvent;
-import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent;
-import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper;
+import WayofTime.bloodmagic.util.PleaseStopUsingMe;
+import WayofTime.bloodmagic.event.AddToNetworkEvent;
+import WayofTime.bloodmagic.event.SoulNetworkEvent;
+import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import com.google.common.base.Strings;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
@@ -112,14 +112,14 @@ public class SoulNetwork implements INBTSerializable<NBTTagCompound> {
             if (syphon < 100 && syphon > 0) {
                 if (!user.capabilities.isCreativeMode) {
                     user.hurtResistantTime = 0;
-                    user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F);
+                    user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F);
                 }
 
             } else if (syphon >= 100) {
                 if (!user.capabilities.isCreativeMode) {
                     for (int i = 0; i < ((syphon + 99) / 100); i++) {
                         user.hurtResistantTime = 0;
-                        user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F);
+                        user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F);
                     }
                 }
             }
@@ -130,7 +130,7 @@ public class SoulNetwork implements INBTSerializable<NBTTagCompound> {
         if (getParent() != null)
             getParent().markDirty();
         else
-            BloodMagicAPI.logger.error("A SoulNetwork was created, but a parent was not set to allow saving.");
+            PleaseStopUsingMe.logger.error("A SoulNetwork was created, but a parent was not set to allow saving.");
     }
 
     @Nullable

src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java

@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.core.recipe;
 
-import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb;
-import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb;
-import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry;
+import WayofTime.bloodmagic.orb.BloodOrb;
+import WayofTime.bloodmagic.orb.IBloodOrb;
+import WayofTime.bloodmagic.core.registry.OrbRegistry;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntComparators;
 import it.unimi.dsi.fastutil.ints.IntList;

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

@@ -1,9 +1,9 @@
-package WayofTime.bloodmagic.apibutnotreally.registry;
+package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper;
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect;
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting;
-import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer;
+import WayofTime.bloodmagic.util.ItemStackWrapper;
+import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect;
+import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCrafting;
+import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import net.minecraft.item.ItemStack;

src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java

@@ -1,6 +1,6 @@
-package WayofTime.bloodmagic.apibutnotreally.registry;
+package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe;
+import WayofTime.bloodmagic.recipe.AlchemyTableRecipe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

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

@@ -1,8 +1,8 @@
-package WayofTime.bloodmagic.apibutnotreally.registry;
+package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI;
-import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper;
-import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier;
+import WayofTime.bloodmagic.util.PleaseStopUsingMe;
+import WayofTime.bloodmagic.util.ItemStackWrapper;
+import WayofTime.bloodmagic.altar.EnumAltarTier;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import net.minecraft.item.ItemStack;
@@ -29,7 +29,7 @@ public class AltarRecipeRegistry {
         if (!recipes.containsValue(altarRecipe) && altarRecipe.getInput().size() > 0)
             recipes.put(altarRecipe.getInput(), altarRecipe);
         else
-            BloodMagicAPI.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString());
+            PleaseStopUsingMe.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString());
     }
 
     public static void registerFillRecipe(ItemStack orbStack, EnumAltarTier tier, int maxForOrb, int consumeRate, int drainRate) {

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

@@ -1,7 +1,7 @@
-package WayofTime.bloodmagic.apibutnotreally.registry;
+package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.apibutnotreally.BlockStack;
-import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler;
+import WayofTime.bloodmagic.util.BlockStack;
+import WayofTime.bloodmagic.iface.IHarvestHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStem;
 

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

@@ -1,8 +1,8 @@
-package WayofTime.bloodmagic.apibutnotreally.registry;
+package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.apibutnotreally.BlockStack;
-import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI;
-import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual;
+import WayofTime.bloodmagic.util.BlockStack;
+import WayofTime.bloodmagic.util.PleaseStopUsingMe;
+import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
@@ -23,7 +23,7 @@ public class ImperfectRitualRegistry {
     public static void registerRitual(ImperfectRitual imperfectRitual, String id, boolean enabled) {
         if (imperfectRitual != null) {
             if (registry.containsKey(id))
-                BloodMagicAPI.logger.error("Duplicate imperfect ritual id: %s", id);
+                PleaseStopUsingMe.logger.error("Duplicate imperfect ritual id: %s", id);
             else {
                 registry.put(id, imperfectRitual);
                 enabledRituals.put(imperfectRitual, enabled);
@@ -71,7 +71,7 @@ public class ImperfectRitualRegistry {
         try {
             return enabledRituals.get(imperfectRitual);
         } catch (NullPointerException e) {
-            BloodMagicAPI.logger.error("Invalid Imperfect Ritual was called");
+            PleaseStopUsingMe.logger.error("Invalid Imperfect Ritual was called");
             return false;
         }
     }

src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java

@@ -1,7 +1,7 @@
-package WayofTime.bloodmagic.apibutnotreally.registry;
+package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade;
-import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe;
+import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade;
+import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;