diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index c8671049..18a83ef5 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -3,9 +3,9 @@ package WayofTime.bloodmagic; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.util.helper.LogHelper; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java index d08c968c..6bac1e53 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffect.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java index e5888e90..9dc68b22 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.fakePlayer.FakePlayerBM; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java index d8f09294..d3e9849c 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java @@ -1,7 +1,5 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java index a5d962b1..85d62dee 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java index 16712dee..9f658335 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCrafting.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java index 6b06b090..b96c9052 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectCraftingNew.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java index 46cc3ed0..3bf96427 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java index 66ce98a8..beb4ba46 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.iface.ISigil; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java index 5f02f6c4..6f1fd59d 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java index 4f89481b..f2cb4612 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java rename to src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java index 789257c5..89b0e042 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; +package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java rename to src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java index 20a70d23..e70e496b 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java rename to src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java index 7598f58a..5100406c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; public class AltarUpgrade { private int speedCount; diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 859c2ffd..3d22f37e 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -3,12 +3,11 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.altar.*; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java index 8f863756..aa0327c8 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java rename to src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java index b783a928..4eaf1714 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java index 666f5be0..0db6e35e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java b/src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java similarity index 73% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java rename to src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java index 5a69420e..5ce9f00c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IAltarManipulator.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java rename to src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java index a8642b89..a72c1afd 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/IBloodAltar.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.altar; +package WayofTime.bloodmagic.altar; public interface IBloodAltar { int getCapacity(); diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index df5dc2b0..12717e3e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.api.IBloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index f6255a0f..d73df0b8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java index 470d1ba3..e65eac53 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.core.recipe.IngredientBloodOrb; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java index 40f01944..2490f9ce 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.api.impl.recipe; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.EnumAltarTier; import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java deleted file mode 100644 index 20478ed8..00000000 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@Deprecated // This entire "api" is going to be nuked over time. Consider all of this unstable. -@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION) -package WayofTime.bloodmagic.apibutnotreally; - -import WayofTime.bloodmagic.BloodMagic; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index 1ced3484..e3b768f0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 81b6dc1a..7a63b22d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -2,16 +2,16 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.iface.IDocumentedBlock; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.IAltarManipulator; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.iface.IAltarReader; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.iface.IDocumentedBlock; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 09af9235..0d61ac9e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.soul.IDemonWillGem; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 7d286cd3..ddea0501 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 44681800..02df2866 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; -import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.teleport.PortalLocation; +import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.block.base.BlockInteger; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index 6dba2cde..85aab8ae 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 5b666693..8828d7c0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.material.Material; import net.minecraft.util.BlockRenderLayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index 56a40037..003a64de 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.IAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.IAltarComponent; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumMimic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index 92e59c3c..5882dc30 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 726b1af4..4b4c1b61 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumRitualController; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 4d51b164..483a10fb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IRitualStone; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index c56ac05e..7b8cc730 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index c242b3b8..4df0bbe5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java index 08188509..01c05b88 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.block.enums; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.util.IStringSerializable; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java index f2c1399e..80705ac1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.gui; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.inventory.ContainerHolding; import WayofTime.bloodmagic.item.inventory.InventoryHolding; import WayofTime.bloodmagic.tile.TileAlchemyTable; diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java index 07b1f281..72f5f05f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import WayofTime.bloodmagic.util.Utils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java index 75792062..a674b457 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.iface.IActivatable; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java index a27b8eba..58f7fc64 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.iface.IMultiWillTool; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java index 6900eead..a1e3af67 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.client.renderer.ItemMeshDefinition; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index b90de1bf..4e330f9e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 91fbb1b7..699916ca 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index e5e91378..29f03cbb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index e7ec2570..f409062a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index c91a06c3..a1e2b461 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index 023db61e..b954ce52 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 1f592774..0c4a9073 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.AltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarTier; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.handler.event.ClientHandler; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index eb13193b..d4cab8a7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.iface.INodeRenderer; +import WayofTime.bloodmagic.iface.INodeRenderer; import WayofTime.bloodmagic.client.helper.ShaderHelper; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 98828c1d..f01b70ee 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.BindableHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.BindableHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.command.CommandBase; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 1b164e28..07a53b22 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index 92eda02e..27a34df7 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index 13b1c7d6..80b78c00 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; import amerifrance.guideapi.page.PageIRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index eb3b8127..fcde6142 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index 599800cc..9648211e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java index 2363e749..92566ab3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index 5b9c507e..6e53c89d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java index 4f5446fd..6c3d17e9 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.guideapi.book; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index 5c925f74..eca0eff2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index a8189038..a26dd233 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java index e6c26b9a..de5265ee 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -4,9 +4,9 @@ import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeJEI; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index c026c81f..b6284e66 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; 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 53d792a2..e6ded288 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java index 8010e978..ea92c210 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java index f1a65187..3a88276f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java index db5ebc33..5ef8c619 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 69515377..10f2f6a2 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.altar; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java index 675eae1c..b14c69fd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java index b1e1eaf9..b5c2fd73 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java index e306b682..ba22f8c5 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java index f0194367..f7baa13c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java index 8e0b0a76..a2493fbd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java index 4f756e80..3d429211 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.binding; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java index 38a92b55..db44651e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import com.google.common.collect.BiMap; import net.minecraft.item.ItemStack; 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 81b69ce8..96b7db2f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.forge; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicJEIPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java index c5908b25..46e16f45 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.waila.provider.*; import WayofTime.bloodmagic.tile.*; import mcp.mobius.waila.api.IWailaPlugin; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index 3a38301f..bc8ade1c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index a7d3a22d..a4ac2b7b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index 477d2393..b664531c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.helper.TextHelper; import mcp.mobius.waila.api.IWailaConfigHandler; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 6769804e..5f5ac41a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.helper.TextHelper; import joptsimple.internal.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index 0463a22b..8f21ea90 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index b13f6d36..2050f6b7 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -1,7 +1,5 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index 9f4a2fcc..1af4b63b 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java rename to src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java index e36149c6..b7da216d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.compress; +package WayofTime.bloodmagic.compress; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java rename to src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java index 786306c9..280bd784 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.compress; +package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.util.Utils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 2d51470c..4dd1822c 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 54e3ca40..992bb9a1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import WayofTime.bloodmagic.entity.mob.*; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index ba331b03..d49617dc 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java rename to src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java index be15d0a9..0eb2be6a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.saving; +package WayofTime.bloodmagic.core.data; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java rename to src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index 54098c72..55b09299 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.apibutnotreally.saving; +package WayofTime.bloodmagic.core.data; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.event.AddToNetworkEvent; -import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.event.AddToNetworkEvent; +import WayofTime.bloodmagic.event.SoulNetworkEvent; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -112,14 +112,14 @@ public class SoulNetwork implements INBTSerializable { if (syphon < 100 && syphon > 0) { if (!user.capabilities.isCreativeMode) { user.hurtResistantTime = 0; - user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F); + user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); } } else if (syphon >= 100) { if (!user.capabilities.isCreativeMode) { for (int i = 0; i < ((syphon + 99) / 100); i++) { user.hurtResistantTime = 0; - user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F); + user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F); } } } @@ -130,7 +130,7 @@ public class SoulNetwork implements INBTSerializable { if (getParent() != null) getParent().markDirty(); else - BloodMagicAPI.logger.error("A SoulNetwork was created, but a parent was not set to allow saving."); + PleaseStopUsingMe.logger.error("A SoulNetwork was created, but a parent was not set to allow saving."); } @Nullable diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java index 9c71bb94..c61289d9 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core.recipe; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.registry.OrbRegistry; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java index 06370e71..36edf7b1 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java index ff55fd94..e09a6ce6 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java index 4e4c9352..789ec6ad 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.altar.EnumAltarTier; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; @@ -29,7 +29,7 @@ public class AltarRecipeRegistry { if (!recipes.containsValue(altarRecipe) && altarRecipe.getInput().size() > 0) recipes.put(altarRecipe.getInput(), altarRecipe); else - BloodMagicAPI.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); + PleaseStopUsingMe.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString()); } public static void registerFillRecipe(ItemStack orbStack, EnumAltarTier tier, int maxForOrb, int consumeRate, int drainRate) { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java index a0a5eeba..ab500fd8 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockStem; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java index 16c5a510..0336e6b0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -23,7 +23,7 @@ public class ImperfectRitualRegistry { public static void registerRitual(ImperfectRitual imperfectRitual, String id, boolean enabled) { if (imperfectRitual != null) { if (registry.containsKey(id)) - BloodMagicAPI.logger.error("Duplicate imperfect ritual id: %s", id); + PleaseStopUsingMe.logger.error("Duplicate imperfect ritual id: %s", id); else { registry.put(id, imperfectRitual); enabledRituals.put(imperfectRitual, enabled); @@ -71,7 +71,7 @@ public class ImperfectRitualRegistry { try { return enabledRituals.get(imperfectRitual); } catch (NullPointerException e) { - BloodMagicAPI.logger.error("Invalid Imperfect Ritual was called"); + PleaseStopUsingMe.logger.error("Invalid Imperfect Ritual was called"); return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java index f2787e34..8360dbd5 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index 0efd5b88..5ddbeb3c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.orb.BloodOrb; import com.google.common.collect.ArrayListMultimap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java index ced086b2..2c778938 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.ritual.data.Ritual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -28,14 +28,14 @@ public class RitualRegistry { */ public static void registerRitual(Ritual ritual, String id, boolean enabled) { if (locked) { - BloodMagicAPI.logger.error("This registry has been locked. Please register your ritual earlier."); - BloodMagicAPI.logger.error("If you reflect this, I will hunt you down. - TehNut"); + PleaseStopUsingMe.logger.error("This registry has been locked. Please register your ritual earlier."); + PleaseStopUsingMe.logger.error("If you reflect this, I will hunt you down. - TehNut"); return; } if (ritual != null) { if (registry.containsKey(id)) - BloodMagicAPI.logger.error("Duplicate ritual id: %s", id); + PleaseStopUsingMe.logger.error("Duplicate ritual id: %s", id); else { registry.put(id, ritual); enabledRituals.put(ritual, enabled); @@ -78,7 +78,7 @@ public class RitualRegistry { try { return enabledRituals.get(ritual); } catch (NullPointerException e) { - BloodMagicAPI.logger.error("Invalid Ritual was called"); + PleaseStopUsingMe.logger.error("Invalid Ritual was called"); return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java index 1090c897..83b075e0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.registry; +package WayofTime.bloodmagic.core.registry; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java index 818bffc3..658280f0 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.DemonWillHolder; import net.minecraft.world.chunk.Chunk; import java.lang.ref.WeakReference; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index 96c4c15c..06cac743 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -45,13 +45,13 @@ public class WorldDemonWillHandler { public static void addWillWorld(int dim) { if (!containedWills.containsKey(dim)) { containedWills.put(dim, new WillWorld(dim)); - BloodMagicAPI.logger.info("Creating demon will cache for world " + dim); + PleaseStopUsingMe.logger.info("Creating demon will cache for world " + dim); } } public static void removeWillWorld(int dim) { containedWills.remove(dim); - BloodMagicAPI.logger.info("Removing demon will cache for world " + dim); + PleaseStopUsingMe.logger.info("Removing demon will cache for world " + dim); } public static void addWillChunk(int dim, Chunk chunk, short base, DemonWillHolder currentWill) { diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index 34879915..cb721ce7 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.gson.Serializers; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index 0ae9a398..5044857f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIAttackStealthMelee; import WayofTime.bloodmagic.entity.ai.EntityAIStealthRetreat; import WayofTime.bloodmagic.entity.ai.EntityAIStealthTowardsTarget; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index 6bed3068..b5869354 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIEatAndCorruptBlock; import WayofTime.bloodmagic.entity.ai.EntityAIProtectAlly; import com.google.common.collect.Maps; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java index f4fcbe89..71290023 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIPickUpAlly; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 4ffeb770..3acc8fed 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.ai.EntityAIAttackRangedBow; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index db068c77..5e2e4e43 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java index 71e6bb84..4c701ace 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.meteor.MeteorRegistry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index e96c4cc9..b4950f64 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.PlayerDemonWillHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java index 4f84073f..4e4798c7 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/AddToNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java rename to src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java index 2875f168..0aca6bcd 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/AltarCraftedEvent.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java rename to src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java index 3e848cf9..66c70ea9 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/BoundToolEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java rename to src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java index d072d39f..7f7e7bf4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/ItemBindEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ public class ItemBindEvent extends Event { /** * This event is called whenever a player attempts to bind a - * {@link WayofTime.bloodmagic.apibutnotreally.iface.IBindable} item. + * {@link WayofTime.bloodmagic.iface.IBindable} item. * * @param player The player doing the binding * @param key The UUID of the player doing the binding diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java rename to src/main/java/WayofTime/bloodmagic/event/RitualEvent.java index dd118b83..d65da6a4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/RitualEvent.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java rename to src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java index 991e7a15..982166b7 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SacrificeKnifeUsedEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.common.eventhandler.Cancelable; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index a39674a3..fc81dbe7 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java rename to src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java index d17ea312..856c9917 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/TeleposeEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.event; +package WayofTime.bloodmagic.event; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index d629f793..3a77e208 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.gson; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import com.google.gson.*; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java rename to src/main/java/WayofTime/bloodmagic/iface/IActivatable.java index c72c4cb7..f9b39342 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IActivatable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java similarity index 66% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java rename to src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java index dfa4559a..f8026ce3 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IAlchemyArray.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java b/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java rename to src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java index d3d0bdc3..0e2e5fbe 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IAltarReader.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java rename to src/main/java/WayofTime/bloodmagic/iface/IBindable.java index 37b32d8f..164d77ff 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IBindable.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java b/src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java similarity index 82% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java rename to src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java index 547eb869..708067ba 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ICustomAlchemyConsumable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java b/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java rename to src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java index ecaa8dd3..10c58212 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IDemonWillViewer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java b/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java rename to src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java index 68ba0fd8..7a991bab 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IDocumentedBlock.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java rename to src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java index c4b38f18..91240f62 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IHarvestHandler.java @@ -1,6 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -16,7 +17,7 @@ public interface IHarvestHandler { * the block types you want. * * @param world - The world the - * {@link WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone} is in. + * {@link IMasterRitualStone} is in. * @param pos - The position of the Block being checked * @param blockStack - The Block being checked * @return If the block was successfully harvested. diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java b/src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java rename to src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java index 72e05cd9..b2daff9c 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IItemLPContainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java b/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java similarity index 52% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java rename to src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java index 519fc6cd..cda13f64 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IMultiWillTool.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.item.ItemStack; public interface IMultiWillTool { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java b/src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java rename to src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java index a12114b0..cc93b3bc 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/INodeRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; /** * Held items that implement this will cause the beams between routing nodes to diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java b/src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java rename to src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java index 777a04e9..22355522 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IPurificationAsh.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java rename to src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java index 16225306..db74ba4a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISentientSwordEffectProvider.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java b/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java rename to src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java index 18ed5e29..3f9693ab 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISentientTool.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java rename to src/main/java/WayofTime/bloodmagic/iface/ISigil.java index 196aa098..5912f52d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/iface/ISigil.java @@ -1,5 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; +import WayofTime.bloodmagic.item.ItemSigil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -8,7 +9,7 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; /** - * Used for all {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemSigil} EXCEPT + * Used for all {@link ItemSigil} EXCEPT * Sigils of Holdings. */ public interface ISigil { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java rename to src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java index f8d30032..6e9197e9 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/iface/IUpgradeTrainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.iface; +package WayofTime.bloodmagic.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java index 3b9002b1..c6019eae 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java index 0bcf8815..b1b2517b 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index 73972287..dfb40d9d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 5ce735b1..804104f5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -1,11 +1,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.altar.BloodAltar; +import WayofTime.bloodmagic.altar.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.altar.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index 092c1bed..4e251de3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index c18428b5..61dd28b9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 19d2d6e3..751a584a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 3de0de3b..ee6f3f2f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index 898fec90..b1842152 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index ebfd3952..773ffb15 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.iface.IActivatable; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index ee605c35..727cfcfb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; -import WayofTime.bloodmagic.apibutnotreally.event.BoundToolEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.ItemStackWrapper; +import WayofTime.bloodmagic.event.BoundToolEvent; +import WayofTime.bloodmagic.iface.IActivatable; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index cf3ee617..15140d9c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -2,8 +2,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.util.helper.PurificationHelper; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.EntityLivingBase; @@ -71,7 +72,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) { target.getEntityWorld().playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); target.setHealth(-1); - target.onDeath(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource); + target.onDeath(PleaseStopUsingMe.damageSource); } return false; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index 89ed3f05..4e62706e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index 4cc7940a..f5d3af13 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; +import WayofTime.bloodmagic.iface.IDemonWillViewer; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index e029fe4f..9b1bd3f3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 1a16af89..52bc7794 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 3bb6f750..81c127fc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 524f1888..cb3c7c2c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index e24e5e98..652021b0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileMasterRitualStone; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 193d027f..07e6be63 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRitualReaderState; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.ritual.data.EnumRitualReaderState; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index a80924ae..bcfd621b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; @@ -97,10 +97,10 @@ public class ItemSacrificialDagger extends ItemEnum ctor = clazz.getConstructor(int.class); if (ctor == null) { - BloodMagicAPI.logger.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); + PleaseStopUsingMe.logger.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); } else { upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor); } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java index 2fa4e8cc..c160c6cd 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.livingArmour; +package WayofTime.bloodmagic.livingArmour; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java rename to src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java index f450b4aa..c9d4d182 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/StatTracker.java @@ -1,6 +1,5 @@ -package WayofTime.bloodmagic.apibutnotreally.livingArmour; +package WayofTime.bloodmagic.livingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index 9162ab95..fe02490a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java index eea9e27e..88b31e64 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index b837ba77..cf948dac 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index af2b15ca..c2a3d980 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index 0b3b6095..06aebdc0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java index c2fb14e7..9272cd48 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java index f30ef882..afca233c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java index a9bc44d3..0b964731 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index 2877f3be..cbdab679 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index 4546f447..d90aa3e5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index 57584dc9..b084083f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index 95e1357f..a89f4588 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index 2a843bcb..f14f0598 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeCriticalStrike; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index a063e192..0a99d49d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 57c67bea..99931891 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index fc0017ea..561cb733 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index c69e03e4..c36f87c6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFireResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index 06a9ecad..b5ef43a6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index bbab4ad4..2b7e5bc5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGraveDigger; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index ff48cb51..3d562a37 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index e9701d9b..73e1b3cc 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index eebfcbc4..7adb31fd 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index 177ad61a..78adec51 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index 53a91cf1..eb44d538 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index 105885bb..77a1e3db 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeNightSight; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 1333750b..4e215caa 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index 31d24e54..16e238bb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index 082a28d4..d81b4e62 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeRepairing; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index a0744780..4a508d89 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index d338e77b..41abc39a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index 00be46cb..c8743426 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index 700edfe1..b5bbec27 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java index d790ca2f..f50e5d59 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index c9714184..64e99f67 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java index 65077f41..64b1ff05 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index 4b69347c..6dac903b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java index d43a8482..d1699406 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java index 73a23691..ba5abaaa 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index d829d828..c394a4af 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index 6cb7e0f6..a4725a05 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java index f277bea7..69a58009 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSpade; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 05f6644f..1e8fdfd3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index acb057e3..69ce784c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java index 6cec3d05..4bb03e62 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index faf8d7d5..2045b972 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 5214502d..5b5abda1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index 966c9b1f..27a39c9f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 5143860a..9b755a27 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index f563ba66..49bd19c0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 318ab46f..80f7093d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index ca20ddb3..0c3a6db7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index 3295882a..d285c11d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 87791649..3fe1f8a0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java index d74bce15..49504483 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 2f14ec9d..83d414d4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java index f7d1f8c4..9d0ea6ce 100644 --- a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.network; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java rename to src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java index adbe7c7a..2c23d393 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/orb/BloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.orb; +package WayofTime.bloodmagic.orb; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.registries.IForgeRegistryEntry; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java b/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java similarity index 75% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java rename to src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java index 6b87ddd5..09848dbb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/orb/IBloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.orb; +package WayofTime.bloodmagic.orb; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index 392a6386..5ba2f665 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -1,8 +1,9 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; @@ -66,7 +67,7 @@ public class BMPotionUtils { } if (incurredDamage > 0) { - entity.attackEntityFrom(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource, (float) incurredDamage); + entity.attackEntityFrom(PleaseStopUsingMe.damageSource, (float) incurredDamage); } return incurredDamage; diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index 2e2bdfa1..40d0d5ed 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 26a98d86..4ae09cac 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.client.Sprite; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 18885435..bfc6ee8d 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; -import WayofTime.bloodmagic.apibutnotreally.ritual.CapabilityRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; -import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.ritual.data.CapabilityRuneType; +import WayofTime.bloodmagic.ritual.data.IRitualStone; +import WayofTime.bloodmagic.teleport.TeleportQueue; import WayofTime.bloodmagic.fuel.FuelHandler; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java index 5ce7e83c..9af2e9d4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableCustomRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; -import WayofTime.bloodmagic.apibutnotreally.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.iface.ICustomAlchemyConsumable; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java index 6cb1cf8d..ecea0ca4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/AlchemyTableRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java index d40eab8b..8fa14ad2 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/LivingArmourDowngradeRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java rename to src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java index 028744fd..db294411 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/TartaricForgeRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.recipe; +package WayofTime.bloodmagic.recipe; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 52d221eb..910be33d 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBanner; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java index 8c21e8e2..33e89171 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index c3564204..931169b8 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.livingArmour.tracker.*; import WayofTime.bloodmagic.livingArmour.upgrade.*; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java index 58516481..80525583 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.inversion.CorruptionHandler; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index de382992..9fb8ae3e 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -2,15 +2,15 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.alchemyArray.*; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; -import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.compress.CompressionRegistry; +import WayofTime.bloodmagic.iface.ISigil; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.AlchemyTableCustomRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.core.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 1343d5fe..8f9beacc 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java index a9785bf9..6ce09db4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.altar.AltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java index e555c69a..147a3791 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java index 93df19e4..9a59ff3a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index c2a6ee58..a364d484 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java index 41b8098d..4f6dc7a6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index f31a03f0..8a801aa6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.compress.CompressionRegistry; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java index c40acf12..b6387112 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index 5a52ad05..d706b79c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index c70de21b..f7749ddf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -2,16 +2,16 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java index 1207dd3c..a426c67a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index 4e71364d..52048dbf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java index 3bce44ba..8a8f5181 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 2bac524c..8a6f9cfb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockFarmland; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java index 574ed869..b1d4d478 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java index 0d4e0f61..22a26195 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java index 1d27ada9..84da47b7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java index 082edc55..d3878ed7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -198,7 +198,7 @@ public class RitualLava extends Ritual { } if (!entity.isDead && entity.hurtTime <= 0 && Utils.isImmuneToFireDamage(entity)) { - if (entity.attackEntityFrom(BloodMagicAPI.damageSource, damage)) { + if (entity.attackEntityFrom(PleaseStopUsingMe.damageSource, damage)) { corrosiveDrained += corrosiveWillDrain; corrosiveWill -= corrosiveWillDrain; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java index 8034d1b8..936d7d77 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.effect.EntityLightningBolt; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 794bb119..42d262ed 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java index 36706d6e..42052ea9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.meteor.Meteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java index 37dd74e7..7c4da792 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 85acd27b..0c4503d8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; -import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; +import WayofTime.bloodmagic.teleport.PortalLocation; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.tile.TileDimensionalPortal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java index ede507a1..bdb869bc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Lists; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java index 9eea0094..b2eb76bb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -92,7 +92,7 @@ public class RitualRegeneration extends Ritual { float currentHealth = damagedEntity.getHealth(); - damagedEntity.attackEntityFrom(BloodMagicAPI.damageSource, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); + damagedEntity.attackEntityFrom(PleaseStopUsingMe.damageSource, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); float healthDifference = currentHealth - damagedEntity.getHealth(); if (healthDifference > 0) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java index bb3035b6..57b51bcf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java index 369f8873..3bb9ed0d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java index 3b42d23a..fe1a3a07 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.StatTracker; +import WayofTime.bloodmagic.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.ritual.data.*; import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java index 13e0e257..82e5bc43 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index bda9622f..ba3bc5e0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index c406b163..a397d22e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.ritual.data.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java index f2ea64be..c898bf3e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/AreaDescriptor.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java index 40be45bf..3ed6c7b9 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/CapabilityRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java similarity index 62% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java index f2d3cc8f..0944cbcb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRitualReaderState.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; public enum EnumRitualReaderState { SET_AREA, diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java index 39685b3e..ea1f364a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/EnumRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java index 8cf47ab3..781988fc 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/IMasterRitualStone.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java index 073b9b4b..00017ab0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/IRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java index aa8c8c1c..d75447ce 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/Ritual.java @@ -1,7 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.core.registry.RitualRegistry; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,7 +22,7 @@ import java.util.Map.Entry; /** * Abstract class for creating new rituals. Rituals need be registered with - * {@link WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry#registerRitual(Ritual, String)} + * {@link RitualRegistry#registerRitual(Ritual, String)} */ public abstract class Ritual { public final ArrayList ritualComponents = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java index ad864ce7..25c46e62 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java index 4c999f20..0138310b 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/RitualRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual; +package WayofTime.bloodmagic.ritual.data; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java index f468513e..eeca00f0 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/IImperfectRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; +package WayofTime.bloodmagic.ritual.data.imperfect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java index c6f668d3..bf78aaee 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/ImperfectRitual.java @@ -1,13 +1,14 @@ -package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; +package WayofTime.bloodmagic.ritual.data.imperfect; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; /** * Abstract class for creating new imperfect rituals. ImperfectRituals need be * registered with - * {@link WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)} + * {@link ImperfectRitualRegistry#registerRitual(ImperfectRitual)} */ public abstract class ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java similarity index 71% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java rename to src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java index e47d4b81..00a78dbb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/data/imperfect/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; +package WayofTime.bloodmagic.ritual.data.imperfect; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 258fdfbe..8e5e9a61 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.harvest; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 6200a003..15f06cdf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; import net.minecraft.block.BlockStem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index 408eab39..f643015e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; -import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.iface.IHarvestHandler; +import WayofTime.bloodmagic.core.registry.HarvestRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index 49c280ac..2d60a7e8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index 80857a9a..caa2bcd7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index 6ec3a207..098c9bba 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java index 88907218..1c3249db 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index 5404ec97..4f2e34fd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.BlockStack; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index 7ec1d9a0..af88a470 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.portal; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; +import WayofTime.bloodmagic.teleport.PortalLocation; import net.minecraftforge.common.DimensionManager; import java.io.*; @@ -27,12 +27,12 @@ public class LocationsHandler implements Serializable { updateFile(fileName, portals); } if (!portals.get(name).isEmpty() && portals.get(name).size() >= 2) { - BloodMagicAPI.logger.info("Location " + name + " already exists."); + PleaseStopUsingMe.logger.info("Location " + name + " already exists."); updateFile(fileName, portals); return false; } else { portals.get(name).add(location); - BloodMagicAPI.logger.info("Adding " + name); + PleaseStopUsingMe.logger.info("Adding " + name); updateFile(fileName, portals); return true; } @@ -42,11 +42,11 @@ public class LocationsHandler implements Serializable { if (portals.get(name) != null && !portals.get(name).isEmpty()) { if (portals.get(name).contains(location)) { portals.get(name).remove(location); - BloodMagicAPI.logger.info("Removing " + name); + PleaseStopUsingMe.logger.info("Removing " + name); updateFile(fileName, portals); return true; } else { - BloodMagicAPI.logger.info("No location matching " + name); + PleaseStopUsingMe.logger.info("No location matching " + name); updateFile(fileName, portals); return false; } @@ -75,10 +75,10 @@ public class LocationsHandler implements Serializable { if (!file.exists()) { if (file.getParentFile().mkdir()) { if (file.createNewFile()) { - BloodMagicAPI.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + PleaseStopUsingMe.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); } } else if (file.createNewFile()) { - BloodMagicAPI.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + PleaseStopUsingMe.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); } } FileInputStream fileIn = new FileInputStream(file); @@ -90,7 +90,7 @@ public class LocationsHandler implements Serializable { } catch (IOException e) { return null; } catch (ClassNotFoundException e) { - BloodMagicAPI.logger.error(String.valueOf(file) + " was not found in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); + PleaseStopUsingMe.logger.error(String.valueOf(file) + " was not found in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory())); return null; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index bde56486..b2571e6d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.portal; -import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.teleport.Teleport; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.event.TeleposeEvent; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.teleport.Teleport; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java rename to src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java index 721cbb99..91422105 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java rename to src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java index fa77f039..8854afb6 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.types.ISubItem; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java index 1387372b..cb83bc1d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java index 96947c98..0d5027ae 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillConduit.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; /** * Implement this interface on a block that can accept and store Demonic Will. diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java index 4878ca07..78c64544 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillGem.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java rename to src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java index dc989bd2..f90c2c98 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDemonWillWeapon.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java b/src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java rename to src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java index c5a34382..9709817a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/soul/IDiscreteDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java rename to src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java index 07d95f3a..89d3b97a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/soul/PlayerDemonWillHandler.java @@ -1,5 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.soul; +package WayofTime.bloodmagic.soul; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -8,7 +9,7 @@ import net.minecraft.util.NonNullList; * This class provides several helper methods in order to handle soul * consumption and use for a player. This refers to the Soul System, meaning * Monster Souls and Soul Gems, etc. The Soul Network's helper methods are found - * in {@link WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper} + * in {@link NetworkHelper} */ public class PlayerDemonWillHandler { /** diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index 42cf8ab8..3ca1a305 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index 84a2843d..dac62074 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java b/src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java similarity index 59% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java rename to src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java index f5a1392e..1f9242f4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/ITeleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; public interface ITeleport { void teleport(); diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java rename to src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java index a861f5c9..ccb55eeb 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java rename to src/main/java/WayofTime/bloodmagic/teleport/Teleport.java index b733e538..18719e16 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/Teleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java rename to src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java index 6e56b7d9..8b3d72e5 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/TeleportQueue.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java index 0bcb1d36..16e7a6fc 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/TeleporterBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.teleport; +package WayofTime.bloodmagic.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 2fddf46c..4d1b42cf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCraftingNew; -import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect; +import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew; +import WayofTime.bloodmagic.iface.IAlchemyArray; +import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 3ceab6be..212edac9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.util.helper.NetworkHelper; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index bfaeefbb..b7b5e5aa 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.altar.EnumAltarTier; +import WayofTime.bloodmagic.altar.IBloodAltar; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index 8e161c77..f0b0b41a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index df286a8b..3d05fe43 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; -import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.IDemonWillGem; +import WayofTime.bloodmagic.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index d4fbdd7d..0e26e4be 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockDemonCrystal; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 4e5d3fdb..eb97e4cb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWillConduit; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index 86ae91b0..80817ce6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.DemonWillHolder; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWillConduit; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index 3899cc39..da6ff9b0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.ritual.data.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index bae862d0..1601a07a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 1d2e8a19..2c77e867 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.inversion.InversionPillarHandler; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 4431af8f..aaf844d2 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.RitualEvent; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.RitualEvent; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.IMasterRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.RitualHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index a1b3a63d..cdda27d8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index bf3dddc8..3e90cb5d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.iface.IPurificationAsh; -import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; +import WayofTime.bloodmagic.iface.IPurificationAsh; +import WayofTime.bloodmagic.ritual.data.AreaDescriptor; +import WayofTime.bloodmagic.util.helper.PurificationHelper; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 64d7fde1..f6909c28 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeTartaricForge; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; +import WayofTime.bloodmagic.soul.IDemonWill; +import WayofTime.bloodmagic.soul.IDemonWillConduit; +import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index 172c7adb..d2d41e2d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.base.TileTicking; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index a8124376..dc2317c8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; -import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.TeleposeEvent; +import WayofTime.bloodmagic.teleport.TeleportQueue; +import WayofTime.bloodmagic.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.helper.PlayerHelper; import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java index c2569ba8..879a0ed3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index 37973d53..a86e82d4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; -import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.soul.IDemonWill; +import WayofTime.bloodmagic.soul.IDemonWillGem; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index 5deac5ea..7fb17330 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.util.GhostItemHelper; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index 2d17f476..c760c950 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.tile.TileInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index 6e13a518..fbc6c626 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.routing.IItemRoutingNode; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java b/src/main/java/WayofTime/bloodmagic/util/BlockStack.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java rename to src/main/java/WayofTime/bloodmagic/util/BlockStack.java index 74e50107..85428c4d 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java +++ b/src/main/java/WayofTime/bloodmagic/util/BlockStack.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +@Deprecated public class BlockStack { private final Block block; private final int meta; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java rename to src/main/java/WayofTime/bloodmagic/util/Constants.java index 581a8fad..77d6d512 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.BloodMagic; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java index 75af1dd6..303bea5a 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index 77862f48..6c454ba8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java rename to src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java index a48a0acd..0163eea1 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -9,6 +9,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +@Deprecated public class ItemStackWrapper { public final Item item; public final int stackSize; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java index 48b7bc95..072d7986 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally; +package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; +import WayofTime.bloodmagic.util.helper.LogHelper; import net.minecraft.util.DamageSource; /** @@ -9,7 +9,8 @@ import net.minecraft.util.DamageSource; * Some API methods can be used via IMC instead. The supported methods are: */ // TODO - Nuke this class -public class BloodMagicAPI { +@Deprecated +public class PleaseStopUsingMe { public static boolean loggingEnabled; public static LogHelper logger = new LogHelper("BloodMagic|API"); diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index fa590b7e..88c989b8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,10 +1,8 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apibutnotreally.BlockStack; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.altar.EnumAltarComponent; +import WayofTime.bloodmagic.iface.IDemonWillViewer; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index caa081bd..f99d4ec6 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; import WayofTime.bloodmagic.client.hud.HUDElement; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.block.RenderFakeBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index add509dc..a859d993 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper; -import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.AltarCraftedEvent; +import WayofTime.bloodmagic.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.helper.ItemHelper; +import WayofTime.bloodmagic.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemInscriptionTool; 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 e75009fe..d9a4d4f2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -3,18 +3,17 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; -import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; -import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; -import WayofTime.bloodmagic.apibutnotreally.util.helper.*; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.ItemBindEvent; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.event.TeleposeEvent; +import WayofTime.bloodmagic.iface.IBindable; +import WayofTime.bloodmagic.iface.ISentientTool; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.data.SoulNetwork; +import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; @@ -33,7 +32,7 @@ import WayofTime.bloodmagic.network.DemonAuraPacketProcessor; import WayofTime.bloodmagic.potion.BMPotionUtils; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.TextHelper; +import WayofTime.bloodmagic.util.helper.*; import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 42e866f8..f78a7e59 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index a98a8e9f..a894a655 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index b83bb3d3..ce76a8d0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.soul.*; +import WayofTime.bloodmagic.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.PosXY; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java index ca573a46..f74bb848 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/BindableHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; -import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.ItemBindEvent; +import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.util.handler.event.GenericHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java index 47aca8bc..40071726 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java index 740043c0..24912b87 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; -import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.iface.IItemLPContainer; +import WayofTime.bloodmagic.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.ItemUpgradeTome; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java index bc6d8de5..3876068e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.util.PleaseStopUsingMe; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,17 +12,17 @@ public class LogHelper { } public void info(String info, Object... format) { - if (BloodMagicAPI.loggingEnabled) + if (PleaseStopUsingMe.loggingEnabled) logger.info(info, format); } public void error(String error, Object... format) { - if (BloodMagicAPI.loggingEnabled) + if (PleaseStopUsingMe.loggingEnabled) logger.error(error, format); } public void debug(String debug, Object... format) { - if (BloodMagicAPI.loggingEnabled) + if (PleaseStopUsingMe.loggingEnabled) logger.debug(debug, format); } diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java index ec5202a6..59a73f3e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NBTHelper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java index cfef4b4b..81f9dabe 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/NetworkHelper.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; -import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; -import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; -import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; -import WayofTime.bloodmagic.apibutnotreally.saving.BMWorldSavedData; -import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.event.SoulNetworkEvent; +import WayofTime.bloodmagic.orb.BloodOrb; +import WayofTime.bloodmagic.orb.IBloodOrb; +import WayofTime.bloodmagic.core.registry.OrbRegistry; +import WayofTime.bloodmagic.core.data.BMWorldSavedData; +import WayofTime.bloodmagic.core.data.SoulNetwork; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java index de1c9c62..2354b3e1 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java index 541a1472..4aec71d4 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; -import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.altar.IBloodAltar; +import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java index 3c6ef594..49057296 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/PurificationHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.util.Constants; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java index fd8e6bcf..97b4853a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.core.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.core.registry.TartaricForgeRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.fml.common.registry.ForgeRegistries; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java rename to src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java index 321e778d..6ecfe11e 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RitualHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.apibutnotreally.util.helper; +package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; -import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; -import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; -import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; -import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.core.registry.RitualRegistry; +import WayofTime.bloodmagic.ritual.data.EnumRuneType; +import WayofTime.bloodmagic.ritual.data.IRitualStone; +import WayofTime.bloodmagic.ritual.data.Ritual; +import WayofTime.bloodmagic.ritual.data.RitualComponent; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity;