diff --git a/build.gradle b/build.gradle index d301d4bb..895a405b 100644 --- a/build.gradle +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/BloodMagic.java b/src/main/java/wayoftime/bloodmagic/BloodMagic.java index 579c5681..9e40cd7d 100644 --- a/src/main/java/wayoftime/bloodmagic/BloodMagic.java +++ b/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.api.impl.BloodMagicCorePlugin; +import wayoftime.bloodmagic.impl.BloodMagicAPI; +import wayoftime.bloodmagic.impl.BloodMagicCorePlugin; import wayoftime.bloodmagic.client.ClientEvents; import wayoftime.bloodmagic.client.hud.Elements; import wayoftime.bloodmagic.client.model.MimicColor; diff --git a/src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java b/src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java index 9bdfd94c..68f26d49 100644 --- a/src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java b/src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java index 4e4d25ec..628d5286 100644 --- a/src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java +++ b/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.api.impl.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.impl.BloodMagicAPI; +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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/IARCTool.java b/src/main/java/wayoftime/bloodmagic/api/item/IARCTool.java similarity index 84% rename from src/main/java/wayoftime/bloodmagic/common/item/IARCTool.java rename to src/main/java/wayoftime/bloodmagic/api/item/IARCTool.java index 1770a005..681d07ec 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/IARCTool.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/iface/IActivatable.java b/src/main/java/wayoftime/bloodmagic/api/item/IActivatable.java similarity index 88% rename from src/main/java/wayoftime/bloodmagic/iface/IActivatable.java rename to src/main/java/wayoftime/bloodmagic/api/item/IActivatable.java index fba799a3..fa63a190 100644 --- a/src/main/java/wayoftime/bloodmagic/iface/IActivatable.java +++ b/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); diff --git a/src/main/java/wayoftime/bloodmagic/iface/IAltarReader.java b/src/main/java/wayoftime/bloodmagic/api/item/IAltarReader.java similarity index 78% rename from src/main/java/wayoftime/bloodmagic/iface/IAltarReader.java rename to src/main/java/wayoftime/bloodmagic/api/item/IAltarReader.java index 5fa997cc..8e69a282 100644 --- a/src/main/java/wayoftime/bloodmagic/iface/IAltarReader.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/iface/IBindable.java b/src/main/java/wayoftime/bloodmagic/api/item/IBindable.java similarity index 96% rename from src/main/java/wayoftime/bloodmagic/iface/IBindable.java rename to src/main/java/wayoftime/bloodmagic/api/item/IBindable.java index a894faed..a9c1c3e9 100644 --- a/src/main/java/wayoftime/bloodmagic/iface/IBindable.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/iface/ICustomAlchemyConsumable.java b/src/main/java/wayoftime/bloodmagic/api/item/ICustomAlchemyConsumable.java similarity index 86% rename from src/main/java/wayoftime/bloodmagic/iface/ICustomAlchemyConsumable.java rename to src/main/java/wayoftime/bloodmagic/api/item/ICustomAlchemyConsumable.java index 1cf6029f..58f57972 100644 --- a/src/main/java/wayoftime/bloodmagic/iface/ICustomAlchemyConsumable.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/IDemonWillViewer.java b/src/main/java/wayoftime/bloodmagic/api/item/IDemonWillViewer.java similarity index 88% rename from src/main/java/wayoftime/bloodmagic/common/item/IDemonWillViewer.java rename to src/main/java/wayoftime/bloodmagic/api/item/IDemonWillViewer.java index b0dabd98..9ee2ef1a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/IDemonWillViewer.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/iface/IMultiWillTool.java b/src/main/java/wayoftime/bloodmagic/api/item/IMultiWillTool.java similarity index 82% rename from src/main/java/wayoftime/bloodmagic/iface/IMultiWillTool.java rename to src/main/java/wayoftime/bloodmagic/api/item/IMultiWillTool.java index 9a95f145..02b84710 100644 --- a/src/main/java/wayoftime/bloodmagic/iface/IMultiWillTool.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/iface/ISigil.java b/src/main/java/wayoftime/bloodmagic/api/item/ISigil.java similarity index 93% rename from src/main/java/wayoftime/bloodmagic/iface/ISigil.java rename to src/main/java/wayoftime/bloodmagic/api/item/ISigil.java index 7c5d020c..8225fe06 100644 --- a/src/main/java/wayoftime/bloodmagic/iface/ISigil.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/BloodMagicRecipe.java b/src/main/java/wayoftime/bloodmagic/api/recipe/BloodMagicRecipe.java similarity index 96% rename from src/main/java/wayoftime/bloodmagic/api/impl/recipe/BloodMagicRecipe.java rename to src/main/java/wayoftime/bloodmagic/api/recipe/BloodMagicRecipe.java index aae4c134..6ff4eaf9 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/BloodMagicRecipe.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java b/src/main/java/wayoftime/bloodmagic/api/recipe/RecipeARC.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java rename to src/main/java/wayoftime/bloodmagic/api/recipe/RecipeARC.java index 1d29eba8..80d9f289 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeARC.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/api/recipe/RecipeAlchemyArray.java similarity index 97% rename from src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java rename to src/main/java/wayoftime/bloodmagic/api/recipe/RecipeAlchemyArray.java index c0f6d1ee..06dfab42 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/api/recipe/RecipeAlchemyTable.java similarity index 97% rename from src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java rename to src/main/java/wayoftime/bloodmagic/api/recipe/RecipeAlchemyTable.java index 394b3efe..25346944 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/wayoftime/bloodmagic/api/recipe/RecipeBloodAltar.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java rename to src/main/java/wayoftime/bloodmagic/api/recipe/RecipeBloodAltar.java index 359c197b..c959c176 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java b/src/main/java/wayoftime/bloodmagic/api/recipe/RecipeTartaricForge.java similarity index 97% rename from src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java rename to src/main/java/wayoftime/bloodmagic/api/recipe/RecipeTartaricForge.java index f0b65de7..8a1f53fb 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/altar/IAltarComponent.java b/src/main/java/wayoftime/bloodmagic/api/tile/IAltarComponent.java similarity index 75% rename from src/main/java/wayoftime/bloodmagic/altar/IAltarComponent.java rename to src/main/java/wayoftime/bloodmagic/api/tile/IAltarComponent.java index 3ecc87d6..730351d3 100644 --- a/src/main/java/wayoftime/bloodmagic/altar/IAltarComponent.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/altar/IBloodAltar.java b/src/main/java/wayoftime/bloodmagic/api/tile/IBloodAltar.java similarity index 91% rename from src/main/java/wayoftime/bloodmagic/altar/IBloodAltar.java rename to src/main/java/wayoftime/bloodmagic/api/tile/IBloodAltar.java index 626a1a9b..1d212292 100644 --- a/src/main/java/wayoftime/bloodmagic/altar/IBloodAltar.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/iface/IBloodRune.java b/src/main/java/wayoftime/bloodmagic/api/tile/IBloodRune.java similarity index 64% rename from src/main/java/wayoftime/bloodmagic/iface/IBloodRune.java rename to src/main/java/wayoftime/bloodmagic/api/tile/IBloodRune.java index e225b5e2..95c6d207 100644 --- a/src/main/java/wayoftime/bloodmagic/iface/IBloodRune.java +++ b/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); } diff --git a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java index 1c26f571..002d0832 100644 --- a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java index 32ca6d5f..eb26c582 100644 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemyTable.java index 9030f733..7691fb0f 100644 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemyTable.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java index 4fa2c9ce..f146ecae 100644 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java index 0332d2ff..b421ff46 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java index 0d993c0c..41bad0eb 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java index f1113705..1bb6c062 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java index 59b622f3..86691b03 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java +++ b/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.contailer.ContainerAlchemyTable; -import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge; +import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber; +import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable; +import wayoftime.bloodmagic.tile.container.ContainerSoulForge; import wayoftime.bloodmagic.will.EnumDemonWillType; public class BloodMagicBlocks diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java index 87792033..9bb51c4a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java index 8b2a500c..d2a49e56 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java index f6df51f4..a6380e0a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java index 0b37cf63..d6793ad9 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java index f4a421d5..fcc54745 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java index 89dfef5d..1b0d5d35 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java +++ b/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.iface.ISigil; +import wayoftime.bloodmagic.api.item.IBindable; +import wayoftime.bloodmagic.api.item.ISigil; import wayoftime.bloodmagic.util.Constants; import wayoftime.bloodmagic.util.helper.NBTHelper; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java b/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java index a0fd9865..defbb762 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java index ba62e111..0105d0ba 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java index f2332c44..76730f9a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java index 2b995104..2a32b311 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java +++ b/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.iface.ISigil; +import wayoftime.bloodmagic.api.item.IAltarReader; +import wayoftime.bloodmagic.api.item.ISigil; import wayoftime.bloodmagic.tile.TileIncenseAltar; import wayoftime.bloodmagic.util.ChatUtil; import wayoftime.bloodmagic.util.helper.NetworkHelper; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java index 7fd76930..7f5b3bf2 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java index 10f44429..501b461e 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java +++ b/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.iface.ISigil; +import wayoftime.bloodmagic.api.item.IActivatable; +import wayoftime.bloodmagic.api.item.ISigil; import wayoftime.bloodmagic.util.Constants; import wayoftime.bloodmagic.util.helper.NBTHelper; import wayoftime.bloodmagic.util.helper.NetworkHelper; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java index a9071c53..771f3315 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java index e5682d3d..78dc4395 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java index e3a0be8c..b371bbe8 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java index 304ec6a5..125fb0ff 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java index eae1f54e..b7f00f64 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java index e149931c..41b27cf4 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java index 6a21c8c0..56e78285 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java index 048fe514..f176e79a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java +++ b/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.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.api.recipe.RecipeARC; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable; +import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge; public class BloodMagicRecipeType { diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java index 93736762..9ce6ea5a 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java +++ b/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 extends ForgeRegistryEntry> diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java index 6a37051f..08e8ae0c 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java index f8417948..34a42e0f 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java index 66852235..fd6e19fa 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java index bf8d009e..e6b460ce 100644 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java index 13b04af8..f191aef7 100644 --- a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java +++ b/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.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.api.recipe.RecipeARC; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable; +import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar; +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; diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index c9c59759..55be8f70 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java index b2c23b8f..b11a400d 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java index 51cbc160..c48573e7 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java index 95751839..434155b0 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java index 2c8b7332..823eaef9 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index 590ff6c3..1b1a4637 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java index e04f63fd..87cd3843 100644 --- a/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java index e1af6cee..94f1fe27 100644 --- a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java +++ b/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.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray; import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect; import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting; diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java index e346f33f..bbebf4c9 100644 --- a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java +++ b/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.api.impl.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray; import wayoftime.bloodmagic.client.render.alchemyarray.AlchemyArrayRenderer; public class AlchemyArrayRendererRegistry diff --git a/src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java b/src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java index 48f9bdcc..03857aea 100644 --- a/src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicAPI.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicAPI.java rename to src/main/java/wayoftime/bloodmagic/impl/BloodMagicAPI.java index c792ad1f..2f0853ec 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicCorePlugin.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicCorePlugin.java rename to src/main/java/wayoftime/bloodmagic/impl/BloodMagicCorePlugin.java index 36386d50..84c796dd 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicRecipeRegistrar.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java rename to src/main/java/wayoftime/bloodmagic/impl/BloodMagicRecipeRegistrar.java index 5a32be1c..28bc9b0a 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/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.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.api.recipe.RecipeARC; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyArray; +import wayoftime.bloodmagic.api.recipe.RecipeAlchemyTable; +import wayoftime.bloodmagic.api.recipe.RecipeBloodAltar; +import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge; import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar diff --git a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicValueManager.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicValueManager.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicValueManager.java rename to src/main/java/wayoftime/bloodmagic/impl/BloodMagicValueManager.java index 41e3f1b4..da7d6cd5 100644 --- a/src/main/java/wayoftime/bloodmagic/api/impl/BloodMagicValueManager.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java index 684cfbbf..fe41fe5e 100644 --- a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeARC.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java index 91dd9e07..8ad20f61 100644 --- a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyArray.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyTable.java index 0b671bde..2f3c8561 100644 --- a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeAlchemyTable.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java index ae6a87bf..5516492b 100644 --- a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeBloodAltar.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java b/src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java index 71ce5276..9a27d688 100644 --- a/src/main/java/wayoftime/bloodmagic/recipe/IRecipeTartaricForge.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/wayoftime/bloodmagic/registry/ModTranquilityHandlers.java index b41925a3..e9083d33 100644 --- a/src/main/java/wayoftime/bloodmagic/registry/ModTranquilityHandlers.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java index ef6cf518..db41851b 100644 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java index 704162ff..bf38f795 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java +++ b/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.api.impl.recipe.RecipeARC; -import wayoftime.bloodmagic.common.item.IARCTool; +import wayoftime.bloodmagic.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.recipe.RecipeARC; +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; diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java index 251862cf..1c0d85dc 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java +++ b/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.api.impl.recipe.RecipeAlchemyTable; +import wayoftime.bloodmagic.impl.BloodMagicAPI; +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; diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAltar.java b/src/main/java/wayoftime/bloodmagic/tile/TileAltar.java index b0986400..c35979b6 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAltar.java +++ b/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 { diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java index dc25f7f4..e4991dc0 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java b/src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java index 6f8fccde..31ab172b 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java +++ b/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.api.impl.recipe.RecipeTartaricForge; -import wayoftime.bloodmagic.tile.contailer.ContainerSoulForge; +import wayoftime.bloodmagic.impl.BloodMagicAPI; +import wayoftime.bloodmagic.api.recipe.RecipeTartaricForge; +import wayoftime.bloodmagic.tile.container.ContainerSoulForge; import wayoftime.bloodmagic.util.Constants; import wayoftime.bloodmagic.will.EnumDemonWillType; import wayoftime.bloodmagic.will.IDemonWill; diff --git a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemicalReactionChamber.java similarity index 99% rename from src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java rename to src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemicalReactionChamber.java index 01bd3506..75dd0583 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemicalReactionChamber.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemyTable.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemyTable.java rename to src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemyTable.java index 8e84f64e..10afc977 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerAlchemyTable.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerSoulForge.java b/src/main/java/wayoftime/bloodmagic/tile/container/ContainerSoulForge.java similarity index 98% rename from src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerSoulForge.java rename to src/main/java/wayoftime/bloodmagic/tile/container/ContainerSoulForge.java index cb242cbc..0deaed05 100644 --- a/src/main/java/wayoftime/bloodmagic/tile/contailer/ContainerSoulForge.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/util/Utils.java b/src/main/java/wayoftime/bloodmagic/util/Utils.java index e5064b82..753c7a29 100644 --- a/src/main/java/wayoftime/bloodmagic/util/Utils.java +++ b/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 diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java index 34044221..faf9549f 100644 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/NetworkHelper.java index 1eca73c4..cde1398f 100644 --- a/src/main/java/wayoftime/bloodmagic/util/helper/NetworkHelper.java +++ b/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; diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/PlayerSacrificeHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/PlayerSacrificeHelper.java index 0f247bbc..aea347e2 100644 --- a/src/main/java/wayoftime/bloodmagic/util/helper/PlayerSacrificeHelper.java +++ b/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