Initial stab at API structuring (#1711)

build.gradle

@@ -163,10 +163,29 @@ sourceSets.main.resources {
     srcDir 'src/generated/resources'
 }
 
+task srcJar(type: Jar) {
+    from(sourceSets.main.java)
+    classifier = 'sources'
+}
+
+task apiJar(type: Jar) {
+    from(sourceSets.main.allJava)
+    from(sourceSets.main.output)
+    include 'wayoftime/bloodmagic/api/**'
+
+    classifier = 'api'
+}
+
+artifacts {
+    archives srcJar, apiJar
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
             artifact jar
+            artifact srcJar
+            artifact apiJar
         }
     }
     repositories {

src/main/java/wayoftime/bloodmagic/BloodMagic.java

@@ -35,8 +35,8 @@ import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
-import wayoftime.bloodmagic.api.impl.BloodMagicCorePlugin;
+import wayoftime.bloodmagic.impl.BloodMagicCorePlugin;
 import wayoftime.bloodmagic.client.ClientEvents;
 import wayoftime.bloodmagic.client.hud.Elements;
 import wayoftime.bloodmagic.client.model.MimicColor;

src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java

@@ -12,7 +12,8 @@ import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.api.tile.IAltarComponent;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
 import wayoftime.bloodmagic.common.block.BlockBloodRune;
 import wayoftime.bloodmagic.tile.TileAltar;
 

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

@@ -19,12 +19,12 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 import net.minecraftforge.items.ItemHandlerHelper;
 import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
+import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
 import wayoftime.bloodmagic.block.enums.BloodRuneType;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.core.data.Binding;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 import wayoftime.bloodmagic.orb.BloodOrb;
 import wayoftime.bloodmagic.orb.IBloodOrb;
 import wayoftime.bloodmagic.tile.TileAltar;

src/main/java/wayoftime/bloodmagic/api/item/IARCTool.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.common.item;
+package wayoftime.bloodmagic.api.item;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/wayoftime/bloodmagic/api/item/IActivatable.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.iface;
+package wayoftime.bloodmagic.api.item;
 
 import javax.annotation.Nonnull;
 
@@ -6,9 +6,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import wayoftime.bloodmagic.util.Constants;
 
+/**
+ * Interface for activatable items
+ */
 public interface IActivatable
 {
-
 	default boolean getActivated(ItemStack stack)
 	{
 		return !stack.isEmpty() && stack.hasTag() && stack.getTag().getBoolean(Constants.NBT.ACTIVATED);

src/main/java/wayoftime/bloodmagic/api/item/IAltarReader.java

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

src/main/java/wayoftime/bloodmagic/api/item/IBindable.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.iface;
+package wayoftime.bloodmagic.api.item;
 
 import javax.annotation.Nullable;
 

src/main/java/wayoftime/bloodmagic/api/item/ICustomAlchemyConsumable.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.iface;
+package wayoftime.bloodmagic.api.item;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/wayoftime/bloodmagic/api/item/IDemonWillViewer.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.common.item;
+package wayoftime.bloodmagic.api.item;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;

src/main/java/wayoftime/bloodmagic/api/item/IMultiWillTool.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.iface;
+package wayoftime.bloodmagic.api.item;
 
 import net.minecraft.item.ItemStack;
 import wayoftime.bloodmagic.will.EnumDemonWillType;

src/main/java/wayoftime/bloodmagic/api/item/ISigil.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.iface;
+package wayoftime.bloodmagic.api.item;
 
 import javax.annotation.Nonnull;
 

src/main/java/wayoftime/bloodmagic/api/recipe/BloodMagicRecipe.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl.recipe;
+package wayoftime.bloodmagic.api.recipe;
 
 import javax.annotation.Nonnull;
 

src/main/java/wayoftime/bloodmagic/api/recipe/RecipeARC.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl.recipe;
+package wayoftime.bloodmagic.api.recipe;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/wayoftime/bloodmagic/api/recipe/RecipeAlchemyArray.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl.recipe;
+package wayoftime.bloodmagic.api.recipe;
 
 import javax.annotation.Nonnull;
 

src/main/java/wayoftime/bloodmagic/api/recipe/RecipeAlchemyTable.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl.recipe;
+package wayoftime.bloodmagic.api.recipe;
 
 import java.util.List;
 

src/main/java/wayoftime/bloodmagic/api/recipe/RecipeBloodAltar.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl.recipe;
+package wayoftime.bloodmagic.api.recipe;
 
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;

src/main/java/wayoftime/bloodmagic/api/recipe/RecipeTartaricForge.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl.recipe;
+package wayoftime.bloodmagic.api.recipe;
 
 import java.util.List;
 

src/main/java/wayoftime/bloodmagic/api/tile/IAltarComponent.java

@@ -1,10 +1,11 @@
-package wayoftime.bloodmagic.altar;
+package wayoftime.bloodmagic.api.tile;
 
 import javax.annotation.Nullable;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import wayoftime.bloodmagic.altar.ComponentType;
 
 public interface IAltarComponent
 {

src/main/java/wayoftime/bloodmagic/api/tile/IBloodAltar.java

@@ -1,4 +1,6 @@
-package wayoftime.bloodmagic.altar;
+package wayoftime.bloodmagic.api.tile;
+
+import wayoftime.bloodmagic.altar.AltarTier;
 
 public interface IBloodAltar
 {

src/main/java/wayoftime/bloodmagic/api/tile/IBloodRune.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.iface;
+package wayoftime.bloodmagic.api.tile;
 
 import javax.annotation.Nullable;
 
@@ -6,9 +6,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import wayoftime.bloodmagic.block.enums.BloodRuneType;
 
+/**
+ * Any block that implements this interface wil be considered as Blood Runes for the Blood Altar
+ */
 public interface IBloodRune
 {
-
 	@Nullable
 	BloodRuneType getBloodRune(World world, BlockPos pos);
 }

src/main/java/wayoftime/bloodmagic/client/ClientEvents.java

@@ -32,7 +32,7 @@ import wayoftime.bloodmagic.common.item.ItemSacrificialDagger;
 import wayoftime.bloodmagic.common.item.sigil.ItemSigilToggleable;
 import wayoftime.bloodmagic.common.item.soul.ItemSentientSword;
 import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes;
-import wayoftime.bloodmagic.iface.IMultiWillTool;
+import wayoftime.bloodmagic.api.item.IMultiWillTool;
 import wayoftime.bloodmagic.tile.TileAlchemyArray;
 import wayoftime.bloodmagic.tile.TileAltar;
 import wayoftime.bloodmagic.tile.TileDemonCrucible;

src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java

@@ -13,7 +13,7 @@ import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber;
-import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber;
+import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber;
 import wayoftime.bloodmagic.util.handler.event.ClientHandler;
 
 public class ScreenAlchemicalReactionChamber extends ScreenBase<ContainerAlchemicalReactionChamber>

src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemyTable.java

@@ -11,7 +11,7 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.tile.TileAlchemyTable;
-import wayoftime.bloodmagic.tile.contailer.ContainerAlchemyTable;
+import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable;
 
 public class ScreenAlchemyTable extends ScreenBase<ContainerAlchemyTable>
 {

src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java

@@ -10,7 +10,7 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.tile.TileSoulForge;
-import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge;
+import wayoftime.bloodmagic.tile.container.ContainerSoulForge;
 
 public class ScreenSoulForge extends ScreenBase<ContainerSoulForge>
 {

src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java

@@ -16,7 +16,7 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ToolType;
-import wayoftime.bloodmagic.iface.IAltarReader;
+import wayoftime.bloodmagic.api.item.IAltarReader;
 import wayoftime.bloodmagic.tile.TileAltar;
 import wayoftime.bloodmagic.util.Utils;
 

src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java

@@ -16,7 +16,7 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ToolType;
 import wayoftime.bloodmagic.block.enums.BloodRuneType;
-import wayoftime.bloodmagic.iface.IBloodRune;
+import wayoftime.bloodmagic.api.tile.IBloodRune;
 
 public class BlockBloodRune extends Block implements IBloodRune
 {

src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java

@@ -20,7 +20,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ToolType;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.common.item.ItemActivationCrystal;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 import wayoftime.bloodmagic.ritual.Ritual;
 import wayoftime.bloodmagic.tile.TileMasterRitualStone;
 import wayoftime.bloodmagic.util.helper.RitualHelper;

src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java

@@ -32,9 +32,9 @@ import wayoftime.bloodmagic.block.enums.BloodRuneType;
 import wayoftime.bloodmagic.common.block.base.BlockPillarCap;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
 import wayoftime.bloodmagic.ritual.EnumRuneType;
-import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber;
+import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber;
-import wayoftime.bloodmagic.tile.contailer.ContainerAlchemyTable;
+import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable;
-import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge;
+import wayoftime.bloodmagic.tile.container.ContainerSoulForge;
 import wayoftime.bloodmagic.will.EnumDemonWillType;
 
 public class BloodMagicBlocks

src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java

@@ -16,7 +16,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 import wayoftime.bloodmagic.api.SerializerHelper;
 import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
 import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder;
 import wayoftime.bloodmagic.util.Constants;
 

src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java

@@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
 import wayoftime.bloodmagic.api.SerializerHelper;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
 import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder;
 import wayoftime.bloodmagic.util.Constants;
 

src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java

@@ -14,7 +14,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.core.data.Binding;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 
 public class ItemActivationCrystal extends Item implements IBindable
 {

src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java

@@ -12,7 +12,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.core.data.Binding;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 
 public class ItemBindableBase extends Item implements IBindable
 {

src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java

@@ -13,6 +13,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
+import wayoftime.bloodmagic.api.item.IDemonWillViewer;
 import wayoftime.bloodmagic.util.handler.event.GenericHandler;
 
 public class ItemDemonWillGauge extends Item implements IDemonWillViewer

src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java

@@ -11,8 +11,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.core.data.Binding;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 

src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java

@@ -11,7 +11,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.common.item.IARCTool;
+import wayoftime.bloodmagic.api.item.IARCTool;
 import wayoftime.bloodmagic.util.ChatUtil;
 
 public class ItemARCToolBase extends Item implements IARCTool

src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java

@@ -9,7 +9,7 @@ import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 import wayoftime.bloodmagic.core.data.SoulTicket;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;
 import wayoftime.bloodmagic.util.helper.PlayerHelper;
 

src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java

@@ -14,7 +14,7 @@ import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.core.data.SoulNetwork;
 import wayoftime.bloodmagic.core.data.SoulTicket;
 import wayoftime.bloodmagic.entity.projectile.EntityBloodLight;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;

src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java

@@ -16,10 +16,10 @@ import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
-import wayoftime.bloodmagic.altar.IBloodAltar;
+import wayoftime.bloodmagic.api.tile.IBloodAltar;
 import wayoftime.bloodmagic.core.data.Binding;
-import wayoftime.bloodmagic.iface.IAltarReader;
+import wayoftime.bloodmagic.api.item.IAltarReader;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.tile.TileIncenseAltar;
 import wayoftime.bloodmagic.util.ChatUtil;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;

src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java

@@ -14,7 +14,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import wayoftime.bloodmagic.core.data.SoulTicket;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;
 import wayoftime.bloodmagic.util.helper.PlayerHelper;
 

src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java

@@ -14,8 +14,8 @@ import net.minecraft.world.World;
 import wayoftime.bloodmagic.common.item.ItemSigil;
 import wayoftime.bloodmagic.core.data.Binding;
 import wayoftime.bloodmagic.core.data.SoulTicket;
-import wayoftime.bloodmagic.iface.IActivatable;
+import wayoftime.bloodmagic.api.item.IActivatable;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;

src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java

@@ -15,7 +15,7 @@ import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import wayoftime.bloodmagic.core.data.SoulTicket;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;
 import wayoftime.bloodmagic.util.helper.PlayerHelper;
 

src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java

@@ -16,7 +16,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import wayoftime.bloodmagic.core.data.SoulTicket;
-import wayoftime.bloodmagic.iface.ISigil;
+import wayoftime.bloodmagic.api.item.ISigil;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;
 import wayoftime.bloodmagic.util.helper.PlayerHelper;
 

src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java

@@ -36,7 +36,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.common.item.BMItemTier;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
-import wayoftime.bloodmagic.iface.IMultiWillTool;
+import wayoftime.bloodmagic.api.item.IMultiWillTool;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 import wayoftime.bloodmagic.will.EnumDemonWillType;

src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java

@@ -36,7 +36,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.common.item.BMItemTier;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
-import wayoftime.bloodmagic.iface.IMultiWillTool;
+import wayoftime.bloodmagic.api.item.IMultiWillTool;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 import wayoftime.bloodmagic.will.EnumDemonWillType;

src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java

@@ -36,7 +36,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.common.item.BMItemTier;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
-import wayoftime.bloodmagic.iface.IMultiWillTool;
+import wayoftime.bloodmagic.api.item.IMultiWillTool;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 import wayoftime.bloodmagic.will.EnumDemonWillType;

src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java

@@ -35,7 +35,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.common.item.BMItemTier;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
-import wayoftime.bloodmagic.iface.IMultiWillTool;
+import wayoftime.bloodmagic.api.item.IMultiWillTool;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 import wayoftime.bloodmagic.will.EnumDemonWillType;

src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java

@@ -20,7 +20,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.iface.IMultiWillTool;
+import wayoftime.bloodmagic.api.item.IMultiWillTool;
 import wayoftime.bloodmagic.util.ChatUtil;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NBTHelper;

src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java

@@ -1,11 +1,11 @@
 package wayoftime.bloodmagic.common.recipe;
 
 import net.minecraft.item.crafting.IRecipeType;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
+import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
 
 public class BloodMagicRecipeType
 {

src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java

@@ -23,7 +23,7 @@ import net.minecraftforge.registries.ForgeRegistryEntry;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.api.SerializerHelper;
 import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
 import wayoftime.bloodmagic.util.Constants;
 
 public class ARCRecipeSerializer<RECIPE extends RecipeARC> extends ForgeRegistryEntry<IRecipeSerializer<?>>

src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java

@@ -13,7 +13,7 @@ import net.minecraft.util.JSONUtils;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 import wayoftime.bloodmagic.api.SerializerHelper;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
 import wayoftime.bloodmagic.util.Constants;
 
 public class AlchemyArrayRecipeSerializer<RECIPE extends RecipeAlchemyArray>

src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java

@@ -17,7 +17,7 @@ import net.minecraft.util.JSONUtils;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 import wayoftime.bloodmagic.api.SerializerHelper;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
 import wayoftime.bloodmagic.util.Constants;
 
 public class AlchemyTableRecipeSerializer<RECIPE extends RecipeAlchemyTable>

src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java

@@ -13,7 +13,7 @@ import net.minecraft.util.JSONUtils;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 import wayoftime.bloodmagic.api.SerializerHelper;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
+import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
 import wayoftime.bloodmagic.util.Constants;
 
 public class BloodAltarRecipeSerializer<RECIPE extends RecipeBloodAltar>

src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java

@@ -16,7 +16,7 @@ import net.minecraft.util.JSONUtils;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 import wayoftime.bloodmagic.api.SerializerHelper;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
 import wayoftime.bloodmagic.util.Constants;
 
 public class TartaricForgeRecipeSerializer<RECIPE extends RecipeTartaricForge>

src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java

@@ -1,11 +1,11 @@
 package wayoftime.bloodmagic.common.registries;
 
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
+import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
 import wayoftime.bloodmagic.common.recipe.serializer.ARCRecipeSerializer;
 import wayoftime.bloodmagic.common.recipe.serializer.AlchemyArrayRecipeSerializer;
 import wayoftime.bloodmagic.common.recipe.serializer.AlchemyTableRecipeSerializer;

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

@@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.util.ResourceLocation;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
 import wayoftime.bloodmagic.compat.jei.alchemytable.AlchemyTableRecipeCategory;

src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java

@@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.core.registry.OrbRegistry;
 import wayoftime.bloodmagic.util.Constants;

src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java

@@ -22,7 +22,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
+import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.util.ChatUtil;
 import wayoftime.bloodmagic.util.Constants;

src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java

@@ -22,7 +22,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fluids.FluidStack;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.handler.event.ClientHandler;

src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java

@@ -13,7 +13,7 @@ import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.TextHelper;

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

@@ -20,7 +20,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import wayoftime.bloodmagic.BloodMagic;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.common.item.BloodMagicItems;
 import wayoftime.bloodmagic.util.ChatUtil;

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

@@ -1,6 +1,6 @@
 package wayoftime.bloodmagic.core;
 
-import wayoftime.bloodmagic.api.impl.BloodMagicRecipeRegistrar;
+import wayoftime.bloodmagic.impl.BloodMagicRecipeRegistrar;
 
 public class RegistrarBloodMagicRecipes
 {

src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java

@@ -8,8 +8,8 @@ import org.apache.commons.lang3.tuple.Pair;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
 import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect;
 import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting;
 

src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java

@@ -10,8 +10,8 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
 import wayoftime.bloodmagic.client.render.alchemyarray.AlchemyArrayRenderer;
 
 public class AlchemyArrayRendererRegistry

src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java

@@ -4,6 +4,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.eventbus.api.Cancelable;
 import net.minecraftforge.eventbus.api.Event;
+import wayoftime.bloodmagic.api.item.IBindable;
 
 @Cancelable
 public class ItemBindEvent extends Event
@@ -13,7 +14,7 @@ public class ItemBindEvent extends Event
 
 	/**
 	 * This event is called whenever a player attempts to bind a
-	 * {@link wayoftime.bloodmagic.iface.IBindable} item.
+	 * {@link IBindable} item.
 	 *
 	 * @param player    The player doing the binding
 	 * @param itemStack The {@link ItemStack} that the player is binding

src/main/java/wayoftime/bloodmagic/impl/BloodMagicAPI.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl;
+package wayoftime.bloodmagic.impl;
 
 import java.util.List;
 

src/main/java/wayoftime/bloodmagic/impl/BloodMagicCorePlugin.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl;
+package wayoftime.bloodmagic.impl;
 
 import net.minecraft.block.Blocks;
 import wayoftime.bloodmagic.altar.ComponentType;

src/main/java/wayoftime/bloodmagic/impl/BloodMagicRecipeRegistrar.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl;
+package wayoftime.bloodmagic.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,11 +17,11 @@ import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import wayoftime.bloodmagic.api.IBloodMagicRecipeRegistrar;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
+import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
 import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType;
 
 public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar

src/main/java/wayoftime/bloodmagic/impl/BloodMagicValueManager.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.api.impl;
+package wayoftime.bloodmagic.impl;
 
 import java.util.Map;
 

src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java

@@ -12,7 +12,7 @@ import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
 import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType;
 import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers;
 

src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java

@@ -5,7 +5,7 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray;
 import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType;
 import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers;
 

src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyTable.java

@@ -7,7 +7,7 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
 import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType;
 import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers;
 

src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java

@@ -5,7 +5,7 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
+import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar;
 import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType;
 import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers;
 

src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java

@@ -10,7 +10,7 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
 import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType;
 import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers;
 

src/main/java/wayoftime/bloodmagic/registry/ModTranquilityHandlers.java

@@ -4,7 +4,7 @@ import net.minecraft.block.FireBlock;
 import net.minecraft.block.GrassBlock;
 import net.minecraft.block.LeavesBlock;
 import net.minecraft.tags.BlockTags;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
 import wayoftime.bloodmagic.incense.EnumTranquilityType;
 import wayoftime.bloodmagic.incense.IncenseTranquilityRegistry;
 import wayoftime.bloodmagic.incense.TranquilityStack;

src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java

@@ -13,7 +13,7 @@ import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.ConfigHandler;
-import wayoftime.bloodmagic.altar.IBloodAltar;
+import wayoftime.bloodmagic.api.tile.IBloodAltar;
 import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler;
 import wayoftime.bloodmagic.potion.BloodMagicPotions;
 import wayoftime.bloodmagic.ritual.AreaDescriptor;

src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java

@@ -34,13 +34,13 @@ import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.registries.ObjectHolder;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.api.event.recipes.FluidStackIngredient;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeARC;
+import wayoftime.bloodmagic.api.recipe.RecipeARC;
-import wayoftime.bloodmagic.common.item.IARCTool;
+import wayoftime.bloodmagic.api.item.IARCTool;
 import wayoftime.bloodmagic.common.item.inventory.InventoryWrapper;
 import wayoftime.bloodmagic.common.tags.BloodMagicTags;
 import wayoftime.bloodmagic.network.ARCTanksPacket;
-import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber;
+import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.MultiSlotItemHandler;
 

src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java

@@ -26,15 +26,15 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.registries.ObjectHolder;
 import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
+import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable;
 import wayoftime.bloodmagic.core.data.Binding;
 import wayoftime.bloodmagic.core.data.SoulNetwork;
 import wayoftime.bloodmagic.core.data.SoulTicket;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 import wayoftime.bloodmagic.orb.BloodOrb;
 import wayoftime.bloodmagic.orb.IBloodOrb;
-import wayoftime.bloodmagic.tile.contailer.ContainerAlchemyTable;
+import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.util.helper.NetworkHelper;
 

src/main/java/wayoftime/bloodmagic/tile/TileAltar.java

@@ -14,7 +14,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.registries.ObjectHolder;
 import wayoftime.bloodmagic.altar.AltarTier;
 import wayoftime.bloodmagic.altar.BloodAltar;
-import wayoftime.bloodmagic.altar.IBloodAltar;
+import wayoftime.bloodmagic.api.tile.IBloodAltar;
 
 public class TileAltar extends TileInventory implements IBloodAltar, ITickableTileEntity
 {

src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java

@@ -27,7 +27,7 @@ import wayoftime.bloodmagic.core.data.Binding;
 import wayoftime.bloodmagic.core.data.SoulNetwork;
 import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler;
 import wayoftime.bloodmagic.event.RitualEvent;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 import wayoftime.bloodmagic.ritual.AreaDescriptor;
 import wayoftime.bloodmagic.ritual.EnumReaderBoundaries;
 import wayoftime.bloodmagic.ritual.IMasterRitualStone;

src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java

@@ -18,9 +18,9 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.registries.ObjectHolder;
 import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent;
-import wayoftime.bloodmagic.api.impl.BloodMagicAPI;
+import wayoftime.bloodmagic.impl.BloodMagicAPI;
-import wayoftime.bloodmagic.api.impl.recipe.RecipeTartaricForge;
+import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge;
-import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge;
+import wayoftime.bloodmagic.tile.container.ContainerSoulForge;
 import wayoftime.bloodmagic.util.Constants;
 import wayoftime.bloodmagic.will.EnumDemonWillType;
 import wayoftime.bloodmagic.will.IDemonWill;

src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemicalReactionChamber.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.tile.contailer;
+package wayoftime.bloodmagic.tile.container;
 
 import java.util.Optional;
 

src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemyTable.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.tile.contailer;
+package wayoftime.bloodmagic.tile.container;
 
 import javax.annotation.Nullable;
 

src/main/java/wayoftime/bloodmagic/tile/container/ContainerSoulForge.java

@@ -1,4 +1,4 @@
-package wayoftime.bloodmagic.tile.contailer;
+package wayoftime.bloodmagic.tile.container;
 
 import javax.annotation.Nullable;
 

src/main/java/wayoftime/bloodmagic/util/Utils.java

@@ -29,7 +29,7 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.wrapper.PlayerMainInvWrapper;
-import wayoftime.bloodmagic.common.item.IDemonWillViewer;
+import wayoftime.bloodmagic.api.item.IDemonWillViewer;
 import wayoftime.bloodmagic.tile.TileInventory;
 
 public class Utils

src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java

@@ -13,7 +13,7 @@ import wayoftime.bloodmagic.core.data.Binding;
 import wayoftime.bloodmagic.core.data.SoulNetwork;
 import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler;
 import wayoftime.bloodmagic.event.ItemBindEvent;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 import wayoftime.bloodmagic.network.DemonAuraClientPacket;
 import wayoftime.bloodmagic.orb.BloodOrb;
 import wayoftime.bloodmagic.orb.IBloodOrb;

src/main/java/wayoftime/bloodmagic/util/helper/NetworkHelper.java

@@ -15,7 +15,7 @@ import wayoftime.bloodmagic.core.data.SoulNetwork;
 import wayoftime.bloodmagic.core.data.SoulTicket;
 import wayoftime.bloodmagic.core.registry.OrbRegistry;
 import wayoftime.bloodmagic.event.SoulNetworkEvent;
-import wayoftime.bloodmagic.iface.IBindable;
+import wayoftime.bloodmagic.api.item.IBindable;
 import wayoftime.bloodmagic.orb.BloodOrb;
 import wayoftime.bloodmagic.orb.IBloodOrb;
 

src/main/java/wayoftime/bloodmagic/util/helper/PlayerSacrificeHelper.java

@@ -8,7 +8,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import wayoftime.bloodmagic.ConfigHandler;
-import wayoftime.bloodmagic.altar.IBloodAltar;
+import wayoftime.bloodmagic.api.tile.IBloodAltar;
 import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent;
 
 public class PlayerSacrificeHelper