diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 9be19365..e4300cc6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -12,6 +12,10 @@ import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.api.soulNetwork.ComplexNetworkHandler; import WayofTime.alchemicalWizardry.api.spell.SpellEffectRegistry; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.api.summoningRegistry.SummoningRegistry; import WayofTime.alchemicalWizardry.common.*; import WayofTime.alchemicalWizardry.common.alchemy.CombinedPotionRegistry; @@ -32,10 +36,6 @@ import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour; import WayofTime.alchemicalWizardry.common.potion.*; import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer; import WayofTime.alchemicalWizardry.common.rituals.*; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.cse.earth.CSEMeleeDefaultEarth; import WayofTime.alchemicalWizardry.common.spell.complex.effect.cse.earth.CSEMeleeDefensiveEarth; import WayofTime.alchemicalWizardry.common.spell.complex.effect.cse.earth.CSEMeleeEnvironmentalEarth; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/EntitySpellProjectile.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java similarity index 98% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/EntitySpellProjectile.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java index 25ed12ae..becdb32b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/EntitySpellProjectile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java @@ -1,8 +1,5 @@ -package WayofTime.alchemicalWizardry.common.spell.complex; +package WayofTime.alchemicalWizardry.api.spell; -import WayofTime.alchemicalWizardry.api.spell.SpellEffect; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IProjectileImpactEffect; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IProjectileUpdateEffect; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ExtrapolatedMeleeEntityEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ExtrapolatedMeleeEntityEffect.java similarity index 96% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ExtrapolatedMeleeEntityEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/ExtrapolatedMeleeEntityEffect.java index 19603d7d..03929374 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ExtrapolatedMeleeEntityEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ExtrapolatedMeleeEntityEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IMeleeSpellEntityEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java similarity index 71% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IMeleeSpellEntityEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java index 427080c2..6b5d7ef7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IMeleeSpellEntityEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IMeleeSpellWorldEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java similarity index 71% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IMeleeSpellWorldEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java index 83cf6553..b0560cfb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IMeleeSpellWorldEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IProjectileImpactEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java similarity index 78% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IProjectileImpactEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java index 7570edb2..c534823c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IProjectileImpactEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.Entity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IProjectileUpdateEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java similarity index 62% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IProjectileUpdateEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java index 033cef22..e9735388 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/IProjectileUpdateEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ISelfSpellEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java similarity index 69% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ISelfSpellEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java index a666d142..c49edafd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ISelfSpellEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/MeleeSpellCenteredWorldEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/MeleeSpellCenteredWorldEffect.java similarity index 92% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/MeleeSpellCenteredWorldEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/MeleeSpellCenteredWorldEffect.java index 86260f57..68ec0133 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/MeleeSpellCenteredWorldEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/MeleeSpellCenteredWorldEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/MeleeSpellWorldEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/MeleeSpellWorldEffect.java similarity index 87% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/MeleeSpellWorldEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/MeleeSpellWorldEffect.java index cd2eaef2..844b5400 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/MeleeSpellWorldEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/MeleeSpellWorldEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ProjectileImpactEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ProjectileImpactEffect.java similarity index 82% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ProjectileImpactEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/ProjectileImpactEffect.java index 3c35a533..22ef5db8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ProjectileImpactEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ProjectileImpactEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; public abstract class ProjectileImpactEffect implements IProjectileImpactEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ProjectileUpdateEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ProjectileUpdateEffect.java similarity index 82% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ProjectileUpdateEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/ProjectileUpdateEffect.java index 77c466af..500e7cfb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ProjectileUpdateEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/ProjectileUpdateEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; public abstract class ProjectileUpdateEffect implements IProjectileUpdateEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/SelfSpellEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SelfSpellEffect.java similarity index 81% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/SelfSpellEffect.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SelfSpellEffect.java index c95a91cf..5e9e356d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/SelfSpellEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SelfSpellEffect.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects; +package WayofTime.alchemicalWizardry.api.spell; public abstract class SelfSpellEffect implements ISelfSpellEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEffect.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEffect.java index 5123d0d6..1ae52ba6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEffect.java @@ -1,7 +1,6 @@ package WayofTime.alchemicalWizardry.api.spell; import net.minecraft.nbt.NBTTagCompound; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement; /** * New wrapper class to enclose the ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancement.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java similarity index 82% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancement.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java index 8cb26bf7..acbbdcc8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.enhancement; +package WayofTime.alchemicalWizardry.api.spell; public class SpellEnhancement { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementCost.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java similarity index 68% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementCost.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java index 51fd717f..8078ce64 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementCost.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.enhancement; +package WayofTime.alchemicalWizardry.api.spell; public class SpellEnhancementCost extends SpellEnhancement { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementPotency.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java similarity index 68% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementPotency.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java index f2e51faf..a540f89d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementPotency.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.enhancement; +package WayofTime.alchemicalWizardry.api.spell; public class SpellEnhancementPotency extends SpellEnhancement { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementPower.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java similarity index 68% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementPower.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java index 735da367..044ef100 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/enhancement/SpellEnhancementPower.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.spell.complex.enhancement; +package WayofTime.alchemicalWizardry.api.spell; public class SpellEnhancementPower extends SpellEnhancement { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigm.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigm.java index e0c8e13f..5423cb4f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigm.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigm.java @@ -6,7 +6,6 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement; public abstract class SpellParadigm { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmMelee.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmMelee.java similarity index 79% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmMelee.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmMelee.java index ffe8d51e..e5b09ce3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmMelee.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmMelee.java @@ -1,10 +1,6 @@ -package WayofTime.alchemicalWizardry.common.spell.complex; +package WayofTime.alchemicalWizardry.api.spell; -import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IMeleeSpellEntityEffect; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IMeleeSpellWorldEffect; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmProjectile.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmProjectile.java similarity index 84% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmProjectile.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmProjectile.java index 3fbcf2e8..848f92dd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmProjectile.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmProjectile.java @@ -1,11 +1,6 @@ -package WayofTime.alchemicalWizardry.common.spell.complex; +package WayofTime.alchemicalWizardry.api.spell; -import WayofTime.alchemicalWizardry.api.spell.SpellEffect; -import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IProjectileImpactEffect; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.IProjectileUpdateEffect; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmSelf.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmSelf.java similarity index 79% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmSelf.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmSelf.java index 0ba36234..2241dbef 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmSelf.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmSelf.java @@ -1,9 +1,6 @@ -package WayofTime.alchemicalWizardry.common.spell.complex; +package WayofTime.alchemicalWizardry.api.spell; -import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ISelfSpellEffect; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmTool.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java similarity index 98% rename from src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmTool.java rename to src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java index ac9951b1..fc729342 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java @@ -1,13 +1,10 @@ -package WayofTime.alchemicalWizardry.common.spell.complex; +package WayofTime.alchemicalWizardry.api.spell; import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.api.spell.SpellEffect; -import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.items.spell.ItemSpellMultiTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.tool.*; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/bloodutils/api/classes/guide/GuiCategories.java b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiCategories.java similarity index 88% rename from src/main/java/bloodutils/api/classes/guide/GuiCategories.java rename to src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiCategories.java index 99ad8439..917aca0e 100644 --- a/src/main/java/bloodutils/api/classes/guide/GuiCategories.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiCategories.java @@ -1,4 +1,4 @@ -package bloodutils.api.classes.guide; +package WayofTime.alchemicalWizardry.book.classes.guide; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -7,9 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import bloodutils.api.classes.guide.elements.ElementCategory; -import bloodutils.api.compact.Category; -import bloodutils.api.registries.EntryRegistry; +import WayofTime.alchemicalWizardry.book.classes.guide.elements.ElementCategory; +import WayofTime.alchemicalWizardry.book.compact.Category; +import WayofTime.alchemicalWizardry.book.registries.EntryRegistry; public class GuiCategories extends GuiScreen{ public GuiCategories(EntityPlayer player){ diff --git a/src/main/java/bloodutils/api/classes/guide/GuiEntry.java b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiEntry.java similarity index 91% rename from src/main/java/bloodutils/api/classes/guide/GuiEntry.java rename to src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiEntry.java index 57df7cbc..31831c59 100644 --- a/src/main/java/bloodutils/api/classes/guide/GuiEntry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiEntry.java @@ -1,4 +1,4 @@ -package bloodutils.api.classes.guide; +package WayofTime.alchemicalWizardry.book.classes.guide; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -9,11 +9,11 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import bloodutils.api.classes.guide.buttons.ButtonNext; -import bloodutils.api.compact.Category; -import bloodutils.api.compact.Entry; -import bloodutils.api.entries.IEntry; -import bloodutils.api.registries.EntryRegistry; +import WayofTime.alchemicalWizardry.book.classes.guide.buttons.ButtonNext; +import WayofTime.alchemicalWizardry.book.compact.Category; +import WayofTime.alchemicalWizardry.book.compact.Entry; +import WayofTime.alchemicalWizardry.book.entries.IEntry; +import WayofTime.alchemicalWizardry.book.registries.EntryRegistry; public class GuiEntry extends GuiScreen{ public GuiEntry(String key, EntityPlayer player, Category category){ diff --git a/src/main/java/bloodutils/api/classes/guide/GuiIndex.java b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiIndex.java similarity index 92% rename from src/main/java/bloodutils/api/classes/guide/GuiIndex.java rename to src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiIndex.java index 7c3fbe82..7ea11061 100644 --- a/src/main/java/bloodutils/api/classes/guide/GuiIndex.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/GuiIndex.java @@ -1,4 +1,4 @@ -package bloodutils.api.classes.guide; +package WayofTime.alchemicalWizardry.book.classes.guide; import java.util.HashMap; @@ -11,12 +11,12 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import bloodutils.api.classes.guide.buttons.ButtonNext; -import bloodutils.api.classes.guide.buttons.ButtonPage; -import bloodutils.api.classes.guide.elements.ElementCategory; -import bloodutils.api.compact.Category; -import bloodutils.api.compact.Entry; -import bloodutils.api.registries.EntryRegistry; +import WayofTime.alchemicalWizardry.book.classes.guide.buttons.ButtonNext; +import WayofTime.alchemicalWizardry.book.classes.guide.buttons.ButtonPage; +import WayofTime.alchemicalWizardry.book.classes.guide.elements.ElementCategory; +import WayofTime.alchemicalWizardry.book.compact.Category; +import WayofTime.alchemicalWizardry.book.compact.Entry; +import WayofTime.alchemicalWizardry.book.registries.EntryRegistry; public class GuiIndex extends GuiScreen{ public GuiIndex(Category category, EntityPlayer player){ diff --git a/src/main/java/bloodutils/api/classes/guide/buttons/ButtonNext.java b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/buttons/ButtonNext.java similarity index 94% rename from src/main/java/bloodutils/api/classes/guide/buttons/ButtonNext.java rename to src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/buttons/ButtonNext.java index 5c2ee604..c5d185d4 100644 --- a/src/main/java/bloodutils/api/classes/guide/buttons/ButtonNext.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/buttons/ButtonNext.java @@ -1,4 +1,4 @@ -package bloodutils.api.classes.guide.buttons; +package WayofTime.alchemicalWizardry.book.classes.guide.buttons; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/bloodutils/api/classes/guide/buttons/ButtonPage.java b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/buttons/ButtonPage.java similarity index 93% rename from src/main/java/bloodutils/api/classes/guide/buttons/ButtonPage.java rename to src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/buttons/ButtonPage.java index 06275c61..3c33d8f9 100644 --- a/src/main/java/bloodutils/api/classes/guide/buttons/ButtonPage.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/buttons/ButtonPage.java @@ -1,4 +1,4 @@ -package bloodutils.api.classes.guide.buttons; +package WayofTime.alchemicalWizardry.book.classes.guide.buttons; import java.awt.Color; diff --git a/src/main/java/bloodutils/api/classes/guide/elements/ElementCategory.java b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/elements/ElementCategory.java similarity index 82% rename from src/main/java/bloodutils/api/classes/guide/elements/ElementCategory.java rename to src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/elements/ElementCategory.java index 9e970858..c5db9a7a 100644 --- a/src/main/java/bloodutils/api/classes/guide/elements/ElementCategory.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/classes/guide/elements/ElementCategory.java @@ -1,14 +1,14 @@ -package bloodutils.api.classes.guide.elements; +package WayofTime.alchemicalWizardry.book.classes.guide.elements; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import bloodutils.api.classes.guide.GuiIndex; -import bloodutils.api.compact.Category; -import bloodutils.api.helpers.GuiHelper; -import bloodutils.api.interfaces.IEntryElement; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiIndex; +import WayofTime.alchemicalWizardry.book.compact.Category; +import WayofTime.alchemicalWizardry.book.helpers.GuiHelper; +import WayofTime.alchemicalWizardry.book.interfaces.IEntryElement; public class ElementCategory extends GuiScreen implements IEntryElement{ public ElementCategory(Category category, int x, int y, int width, int height, EntityPlayer player) { diff --git a/src/main/java/bloodutils/api/compact/Category.java b/src/main/java/WayofTime/alchemicalWizardry/book/compact/Category.java similarity index 76% rename from src/main/java/bloodutils/api/compact/Category.java rename to src/main/java/WayofTime/alchemicalWizardry/book/compact/Category.java index 3e616443..15911bc5 100644 --- a/src/main/java/bloodutils/api/compact/Category.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/compact/Category.java @@ -1,7 +1,7 @@ -package bloodutils.api.compact; +package WayofTime.alchemicalWizardry.book.compact; import net.minecraft.item.ItemStack; -import bloodutils.api.enums.EnumType; +import WayofTime.alchemicalWizardry.book.enums.EnumType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/bloodutils/api/compact/CompactItem.java b/src/main/java/WayofTime/alchemicalWizardry/book/compact/CompactItem.java similarity index 88% rename from src/main/java/bloodutils/api/compact/CompactItem.java rename to src/main/java/WayofTime/alchemicalWizardry/book/compact/CompactItem.java index aac35a16..93144ad9 100644 --- a/src/main/java/bloodutils/api/compact/CompactItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/compact/CompactItem.java @@ -1,4 +1,4 @@ -package bloodutils.api.compact; +package WayofTime.alchemicalWizardry.book.compact; import net.minecraft.item.Item; diff --git a/src/main/java/bloodutils/api/compact/Entry.java b/src/main/java/WayofTime/alchemicalWizardry/book/compact/Entry.java similarity index 68% rename from src/main/java/bloodutils/api/compact/Entry.java rename to src/main/java/WayofTime/alchemicalWizardry/book/compact/Entry.java index 8a701792..9bcf5632 100644 --- a/src/main/java/bloodutils/api/compact/Entry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/compact/Entry.java @@ -1,6 +1,6 @@ -package bloodutils.api.compact; +package WayofTime.alchemicalWizardry.book.compact; -import bloodutils.api.entries.IEntry; +import WayofTime.alchemicalWizardry.book.entries.IEntry; public class Entry { public Entry(IEntry[] entry, String name, int indexPage){ diff --git a/src/main/java/bloodutils/api/entries/EntryAltarRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryAltarRecipe.java similarity index 96% rename from src/main/java/bloodutils/api/entries/EntryAltarRecipe.java rename to src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryAltarRecipe.java index dbe7df00..faa4d209 100644 --- a/src/main/java/bloodutils/api/entries/EntryAltarRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryAltarRecipe.java @@ -1,4 +1,4 @@ -package bloodutils.api.entries; +package WayofTime.alchemicalWizardry.book.entries; import java.awt.Color; import java.util.ArrayList; @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; -import bloodutils.api.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; public class EntryAltarRecipe implements IEntry{ public EntryAltarRecipe(AltarRecipe recipes){ diff --git a/src/main/java/bloodutils/api/entries/EntryCraftingRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryCraftingRecipe.java similarity index 98% rename from src/main/java/bloodutils/api/entries/EntryCraftingRecipe.java rename to src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryCraftingRecipe.java index 796c8c19..3a286ac4 100644 --- a/src/main/java/bloodutils/api/entries/EntryCraftingRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryCraftingRecipe.java @@ -1,4 +1,4 @@ -package bloodutils.api.entries; +package WayofTime.alchemicalWizardry.book.entries; import java.awt.Color; import java.util.ArrayList; @@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL12; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; -import bloodutils.api.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; public class EntryCraftingRecipe implements IEntry{ public EntryCraftingRecipe(IRecipe recipes){ diff --git a/src/main/java/bloodutils/api/entries/EntryImage.java b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryImage.java similarity index 92% rename from src/main/java/bloodutils/api/entries/EntryImage.java rename to src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryImage.java index 9d9e1720..94fda191 100644 --- a/src/main/java/bloodutils/api/entries/EntryImage.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryImage.java @@ -1,4 +1,4 @@ -package bloodutils.api.entries; +package WayofTime.alchemicalWizardry.book.entries; import java.util.List; @@ -7,8 +7,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import bloodutils.api.classes.guide.GuiEntry; -import bloodutils.api.helpers.GuiHelper; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.helpers.GuiHelper; public class EntryImage implements IEntry{ public EntryImage(String resource, int iconWidth, int iconHeight){ diff --git a/src/main/java/bloodutils/api/entries/EntryItemText.java b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryItemText.java similarity index 96% rename from src/main/java/bloodutils/api/entries/EntryItemText.java rename to src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryItemText.java index b99a71d6..c064c3bb 100644 --- a/src/main/java/bloodutils/api/entries/EntryItemText.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryItemText.java @@ -1,4 +1,4 @@ -package bloodutils.api.entries; +package WayofTime.alchemicalWizardry.book.entries; import java.awt.Color; import java.util.List; @@ -17,7 +17,7 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import bloodutils.api.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; public class EntryItemText implements IEntry{ public EntryItemText(ItemStack stack){ diff --git a/src/main/java/bloodutils/api/entries/EntryRitualInfo.java b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryRitualInfo.java similarity index 88% rename from src/main/java/bloodutils/api/entries/EntryRitualInfo.java rename to src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryRitualInfo.java index df12a088..d74c425d 100644 --- a/src/main/java/bloodutils/api/entries/EntryRitualInfo.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryRitualInfo.java @@ -1,11 +1,11 @@ -package bloodutils.api.entries; +package WayofTime.alchemicalWizardry.book.entries; import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import bloodutils.api.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; public class EntryRitualInfo implements IEntry{ public EntryRitualInfo(int cost){ diff --git a/src/main/java/bloodutils/api/entries/EntryText.java b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryText.java similarity index 90% rename from src/main/java/bloodutils/api/entries/EntryText.java rename to src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryText.java index 7268be74..81545eda 100644 --- a/src/main/java/bloodutils/api/entries/EntryText.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/entries/EntryText.java @@ -1,4 +1,4 @@ -package bloodutils.api.entries; +package WayofTime.alchemicalWizardry.book.entries; import java.util.List; @@ -6,7 +6,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.StatCollector; -import bloodutils.api.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; public class EntryText implements IEntry{ public EntryText(){ diff --git a/src/main/java/bloodutils/api/entries/IEntry.java b/src/main/java/WayofTime/alchemicalWizardry/book/entries/IEntry.java similarity index 86% rename from src/main/java/bloodutils/api/entries/IEntry.java rename to src/main/java/WayofTime/alchemicalWizardry/book/entries/IEntry.java index b9de2c51..5bc72e9d 100644 --- a/src/main/java/bloodutils/api/entries/IEntry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/entries/IEntry.java @@ -1,10 +1,10 @@ -package bloodutils.api.entries; +package WayofTime.alchemicalWizardry.book.entries; import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import bloodutils.api.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; public interface IEntry { /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/book/enums/EnumType.java b/src/main/java/WayofTime/alchemicalWizardry/book/enums/EnumType.java new file mode 100644 index 00000000..16042d7b --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/book/enums/EnumType.java @@ -0,0 +1,5 @@ +package WayofTime.alchemicalWizardry.book.enums; + +public enum EnumType { + BLOCK, ITEM; +} \ No newline at end of file diff --git a/src/main/java/bloodutils/api/helpers/GuiHelper.java b/src/main/java/WayofTime/alchemicalWizardry/book/helpers/GuiHelper.java similarity index 97% rename from src/main/java/bloodutils/api/helpers/GuiHelper.java rename to src/main/java/WayofTime/alchemicalWizardry/book/helpers/GuiHelper.java index 90ab2c51..fd9a8c76 100644 --- a/src/main/java/bloodutils/api/helpers/GuiHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/helpers/GuiHelper.java @@ -1,4 +1,4 @@ -package bloodutils.api.helpers; +package WayofTime.alchemicalWizardry.book.helpers; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; @@ -9,7 +9,7 @@ import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import bloodutils.api.enums.EnumType; +import WayofTime.alchemicalWizardry.book.enums.EnumType; public class GuiHelper { public static boolean isMouseBetween(int mouseX, int mouseY, int x, int y, int width, int height) { diff --git a/src/main/java/bloodutils/api/helpers/OreDictionaryHelper.java b/src/main/java/WayofTime/alchemicalWizardry/book/helpers/OreDictionaryHelper.java similarity index 88% rename from src/main/java/bloodutils/api/helpers/OreDictionaryHelper.java rename to src/main/java/WayofTime/alchemicalWizardry/book/helpers/OreDictionaryHelper.java index 0848155b..d82c0420 100644 --- a/src/main/java/bloodutils/api/helpers/OreDictionaryHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/helpers/OreDictionaryHelper.java @@ -1,4 +1,4 @@ -package bloodutils.api.helpers; +package WayofTime.alchemicalWizardry.book.helpers; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/bloodutils/api/interfaces/IEntryElement.java b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IEntryElement.java similarity index 94% rename from src/main/java/bloodutils/api/interfaces/IEntryElement.java rename to src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IEntryElement.java index 09bd8d7f..5bedc1e0 100644 --- a/src/main/java/bloodutils/api/interfaces/IEntryElement.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IEntryElement.java @@ -1,4 +1,4 @@ -package bloodutils.api.interfaces; +package WayofTime.alchemicalWizardry.book.interfaces; /** * Copied from WaslieCore, to make it no longer require it in the API. (https://github.com/wasliebob/WaslieCore/blob/master/src/main/java/wasliecore/interfaces/IElement.java) diff --git a/src/main/java/bloodutils/api/interfaces/IReviving.java b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IReviving.java similarity index 70% rename from src/main/java/bloodutils/api/interfaces/IReviving.java rename to src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IReviving.java index e8939376..79cea9fc 100644 --- a/src/main/java/bloodutils/api/interfaces/IReviving.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/interfaces/IReviving.java @@ -1,4 +1,4 @@ -package bloodutils.api.interfaces; +package WayofTime.alchemicalWizardry.book.interfaces; import net.minecraft.world.World; diff --git a/src/main/java/bloodutils/api/registries/EntryRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/book/registries/EntryRegistry.java similarity index 84% rename from src/main/java/bloodutils/api/registries/EntryRegistry.java rename to src/main/java/WayofTime/alchemicalWizardry/book/registries/EntryRegistry.java index 1b82db16..5e4f1828 100644 --- a/src/main/java/bloodutils/api/registries/EntryRegistry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/registries/EntryRegistry.java @@ -1,11 +1,11 @@ -package bloodutils.api.registries; +package WayofTime.alchemicalWizardry.book.registries; import java.util.ArrayList; import java.util.HashMap; -import bloodutils.api.compact.Category; -import bloodutils.api.compact.Entry; -import bloodutils.api.entries.IEntry; +import WayofTime.alchemicalWizardry.book.compact.Category; +import WayofTime.alchemicalWizardry.book.compact.Entry; +import WayofTime.alchemicalWizardry.book.entries.IEntry; public class EntryRegistry { public static void registerCategories(Category category){ diff --git a/src/main/java/bloodutils/api/registries/RecipeRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/book/registries/RecipeRegistry.java similarity index 97% rename from src/main/java/bloodutils/api/registries/RecipeRegistry.java rename to src/main/java/WayofTime/alchemicalWizardry/book/registries/RecipeRegistry.java index 5bbd2da4..0126c915 100644 --- a/src/main/java/bloodutils/api/registries/RecipeRegistry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/registries/RecipeRegistry.java @@ -1,4 +1,4 @@ -package bloodutils.api.registries; +package WayofTime.alchemicalWizardry.book.registries; import java.util.ArrayList; diff --git a/src/main/java/bloodutils/api/registries/RevivingRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/book/registries/RevivingRegistry.java similarity index 61% rename from src/main/java/bloodutils/api/registries/RevivingRegistry.java rename to src/main/java/WayofTime/alchemicalWizardry/book/registries/RevivingRegistry.java index c3b97d65..648d288c 100644 --- a/src/main/java/bloodutils/api/registries/RevivingRegistry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/book/registries/RevivingRegistry.java @@ -1,9 +1,9 @@ -package bloodutils.api.registries; +package WayofTime.alchemicalWizardry.book.registries; import java.util.HashMap; -import bloodutils.api.compact.CompactItem; -import bloodutils.api.interfaces.IReviving; +import WayofTime.alchemicalWizardry.book.compact.CompactItem; +import WayofTime.alchemicalWizardry.book.interfaces.IReviving; public class RevivingRegistry { public static void registerReviving(CompactItem ingredients, IReviving reviving){ diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java index 1ef9d2b5..98a51e49 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java @@ -1,6 +1,7 @@ package WayofTime.alchemicalWizardry.client; import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.spell.EntitySpellProjectile; import WayofTime.alchemicalWizardry.common.CommonProxy; import WayofTime.alchemicalWizardry.common.EntityAirElemental; import WayofTime.alchemicalWizardry.common.entity.mob.*; @@ -15,7 +16,6 @@ import WayofTime.alchemicalWizardry.common.renderer.model.*; import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderEnergyBazookaMainProjectile; import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderEnergyBlastProjectile; import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderMeteor; -import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile; import WayofTime.alchemicalWizardry.common.tileEntity.*; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java b/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java index 9af692fd..d79b178d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/CommonProxy.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.spell.EntitySpellProjectile; import WayofTime.alchemicalWizardry.common.entity.projectile.*; -import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import cpw.mods.fml.common.registry.EntityRegistry; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java b/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java index 3d92ac3b..50cca8dd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/book/BUEntries.java @@ -4,17 +4,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.ModItems; -import bloodutils.api.compact.Category; -import bloodutils.api.compact.Entry; -import bloodutils.api.entries.EntryAltarRecipe; -import bloodutils.api.entries.EntryCraftingRecipe; -import bloodutils.api.entries.EntryImage; -import bloodutils.api.entries.EntryItemText; -import bloodutils.api.entries.EntryRitualInfo; -import bloodutils.api.entries.EntryText; -import bloodutils.api.entries.IEntry; -import bloodutils.api.enums.EnumType; -import bloodutils.api.registries.EntryRegistry; +import WayofTime.alchemicalWizardry.book.compact.Category; +import WayofTime.alchemicalWizardry.book.compact.Entry; +import WayofTime.alchemicalWizardry.book.entries.EntryAltarRecipe; +import WayofTime.alchemicalWizardry.book.entries.EntryCraftingRecipe; +import WayofTime.alchemicalWizardry.book.entries.EntryImage; +import WayofTime.alchemicalWizardry.book.entries.EntryItemText; +import WayofTime.alchemicalWizardry.book.entries.EntryRitualInfo; +import WayofTime.alchemicalWizardry.book.entries.EntryText; +import WayofTime.alchemicalWizardry.book.entries.IEntry; +import WayofTime.alchemicalWizardry.book.enums.EnumType; +import WayofTime.alchemicalWizardry.book.registries.EntryRegistry; public class BUEntries { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/spell/ItemSpellMultiTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/spell/ItemSpellMultiTool.java index 73adf060..ebf30859 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/spell/ItemSpellMultiTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/spell/ItemSpellMultiTool.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.items.spell; import WayofTime.alchemicalWizardry.api.spell.SpellEffect; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefaultEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefaultEarth.java index 8b844296..fca0705a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefaultEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefaultEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.MeleeDefaultEarth; public class CSEMeleeDefaultEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefensiveEarth.java index b31930fc..c9e0954d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeDefensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.MeleeDefensiveEarth; public class CSEMeleeDefensiveEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeEnvironmentalEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeEnvironmentalEarth.java index 52981962..35a00764 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeEnvironmentalEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeEnvironmentalEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.MeleeEnvironmentalEarth; public class CSEMeleeEnvironmentalEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeOffensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeOffensiveEarth.java index 2d947895..9e294bb3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeOffensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEMeleeOffensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.MeleeOffensiveEarth; public class CSEMeleeOffensiveEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefaultEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefaultEarth.java index c2a0cb57..3f99eea3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefaultEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefaultEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileDefaultEarth; public class CSEProjectileDefaultEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefensiveEarth.java index 01e0e12c..503fdd2a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileDefensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileDefensiveEarth; public class CSEProjectileDefensiveEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileEnvironmentalEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileEnvironmentalEarth.java index 7ee74eb4..cec867cd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileEnvironmentalEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileEnvironmentalEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileEnvironmentalEarth; public class CSEProjectileEnvironmentalEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileOffensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileOffensiveEarth.java index f0fd1be9..139c88bb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileOffensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEProjectileOffensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ProjectileOffensiveEarth; public class CSEProjectileOffensiveEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefaultEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefaultEarth.java index 8acc0b28..fd767c1b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefaultEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefaultEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.SelfDefaultEarth; public class CSESelfDefaultEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefensiveEarth.java index 501c2032..64700185 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfDefensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.SelfDefensiveEarth; public class CSESelfDefensiveEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfEnvironmentalEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfEnvironmentalEarth.java index a285fd3a..1c5daa18 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfEnvironmentalEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfEnvironmentalEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.SelfEnvironmentalEarth; public class CSESelfEnvironmentalEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfOffensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfOffensiveEarth.java index c242560b..3eb7bf79 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfOffensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSESelfOffensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.SelfOffensiveEarth; public class CSESelfOffensiveEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefaultEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefaultEarth.java index 5afd351c..0b38fa7b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefaultEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefaultEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; public class CSEToolDefaultEarth extends ComplexSpellEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefensiveEarth.java index 854f41b0..98416506 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolDefensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; public class CSEToolDefensiveEarth extends ComplexSpellEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolEnvironmentalEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolEnvironmentalEarth.java index d7167e9b..376db588 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolEnvironmentalEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolEnvironmentalEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ToolEnvironmentalEarth; public class CSEToolEnvironmentalEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolOffensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolOffensiveEarth.java index c402c3ec..02f1cf6b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolOffensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/earth/CSEToolOffensiveEarth.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth.ToolOffensiveEarth; public class CSEToolOffensiveEarth extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefaultFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefaultFire.java index 63e571f4..7c4513aa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefaultFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefaultFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.MeleeDefaultFire; public class CSEMeleeDefaultFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefensiveFire.java index 0f351c10..65915f0a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeDefensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.MeleeDefensiveFire; public class CSEMeleeDefensiveFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeEnvironmentalFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeEnvironmentalFire.java index d337c63f..f8851c7a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeEnvironmentalFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeEnvironmentalFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.MeleeEnvironmentalFire; public class CSEMeleeEnvironmentalFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeOffensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeOffensiveFire.java index 2d0a2fe3..e90b6a01 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeOffensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEMeleeOffensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.MeleeOffensiveFire; public class CSEMeleeOffensiveFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefaultFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefaultFire.java index 37a6bd2e..e87d633a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefaultFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefaultFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileDefaultFire; public class CSEProjectileDefaultFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefensiveFire.java index 01c60055..4739c7f0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileDefensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileDefensiveFire; public class CSEProjectileDefensiveFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileEnvironmentalFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileEnvironmentalFire.java index c9c22e91..be379e54 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileEnvironmentalFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileEnvironmentalFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileEnvironmentalFire; public class CSEProjectileEnvironmentalFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileOffensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileOffensiveFire.java index 836149c5..5637e353 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileOffensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEProjectileOffensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ProjectileOffensiveFire; public class CSEProjectileOffensiveFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefaultFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefaultFire.java index 341dbecb..8cfe7696 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefaultFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefaultFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfDefaultFire; public class CSESelfDefaultFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefensiveFire.java index 8ad4da33..3bc43070 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfDefensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfDefensiveFire; public class CSESelfDefensiveFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfEnvironmentalFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfEnvironmentalFire.java index a9d52848..116ae6d0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfEnvironmentalFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfEnvironmentalFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfEnvironmentalFire; public class CSESelfEnvironmentalFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfOffensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfOffensiveFire.java index b65d262e..c63b8539 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfOffensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSESelfOffensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfOffensiveFire; public class CSESelfOffensiveFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefaultFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefaultFire.java index 8f9afbce..9885e23e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefaultFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefaultFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ToolDefaultFire; public class CSEToolDefaultFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefensiveFire.java index 29f893e9..d6244e78 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolDefensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class CSEToolDefensiveFire extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolEnvironmentalFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolEnvironmentalFire.java index 9ef67f07..b60e1477 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolEnvironmentalFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolEnvironmentalFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ToolEnvironmentalFire; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolOffensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolOffensiveFire.java index cceb913f..f8b5bab2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolOffensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/fire/CSEToolOffensiveFire.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ToolOffensiveFire; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefaultIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefaultIce.java index 0fcd08e4..43e2a0ac 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefaultIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefaultIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeDefaultIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefensiveIce.java index 0b87f726..ebf9f490 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeDefensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeDefensiveIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeEnvironmentalIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeEnvironmentalIce.java index 1ed57699..a5d02899 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeEnvironmentalIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeEnvironmentalIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeEnvironmentalIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeOffensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeOffensiveIce.java index 44054b4f..19296efd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeOffensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEMeleeOffensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.MeleeOffensiveIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefaultIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefaultIce.java index 8bf28c25..f2d31f38 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefaultIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefaultIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileDefaultIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefensiveIce.java index c4cc4670..567cecdf 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileDefensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileDefensiveIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileEnvironmentalIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileEnvironmentalIce.java index a1f78db7..7f2ebaa6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileEnvironmentalIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileEnvironmentalIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileEnvironmentalIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileOffensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileOffensiveIce.java index f3741e3d..963a1a4e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileOffensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEProjectileOffensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ProjectileOffensiveIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefaultIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefaultIce.java index d995000a..e9d45fc9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefaultIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefaultIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfDefaultIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefensiveIce.java index a11fe463..ca803b06 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfDefensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfDefensiveIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfEnvironmentalIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfEnvironmentalIce.java index d802c6ed..ce77cc71 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfEnvironmentalIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfEnvironmentalIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfEnvironmentalIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfOffensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfOffensiveIce.java index 0f24f7ae..6061c5c9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfOffensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSESelfOffensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.SelfOffensiveIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefaultIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefaultIce.java index 139935de..14fe0ea0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefaultIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefaultIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ToolDefaultIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefensiveIce.java index 56dbec98..0602da5c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolDefensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice.ToolDefensiveIce; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolEnvironmentalIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolEnvironmentalIce.java index d82019a8..ac27a2a2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolEnvironmentalIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolEnvironmentalIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class CSEToolEnvironmentalIce extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolOffensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolOffensiveIce.java index 9a975538..15b3fd72 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolOffensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/ice/CSEToolOffensiveIce.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public class CSEToolOffensiveIce extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefaultWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefaultWind.java index f2eec8c7..f47960e9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefaultWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefaultWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.MeleeDefaultWind; public class CSEMeleeDefaultWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefensiveWind.java index e987fd78..c4a05d55 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeDefensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.MeleeDefensiveWind; public class CSEMeleeDefensiveWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeEnvironmentalWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeEnvironmentalWind.java index 2dfc91a3..e47152f4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeEnvironmentalWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeEnvironmentalWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.MeleeEnvironmentalWind; public class CSEMeleeEnvironmentalWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeOffensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeOffensiveWind.java index cb6ed1e2..4af53a16 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeOffensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEMeleeOffensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.MeleeOffensiveWind; public class CSEMeleeOffensiveWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefaultWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefaultWind.java index 709f5e99..387892bd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefaultWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefaultWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ProjectileDefaultWind; public class CSEProjectileDefaultWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefensiveWind.java index e44976f8..2381fda5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileDefensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; public class CSEProjectileDefensiveWind extends ComplexSpellEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileEnvironmentalWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileEnvironmentalWind.java index 11d638a4..154865f2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileEnvironmentalWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileEnvironmentalWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ProjectileEnvironmentalWind; public class CSEProjectileEnvironmentalWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileOffensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileOffensiveWind.java index b5973db4..b215b6be 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileOffensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEProjectileOffensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ProjectileOffensiveWind; public class CSEProjectileOffensiveWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefaultWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefaultWind.java index 4f98bfca..4641e662 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefaultWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefaultWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.SelfDefaultWind; public class CSESelfDefaultWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefensiveWind.java index 7887f3c0..7538b1d8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfDefensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.SelfDefensiveWind; public class CSESelfDefensiveWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfEnvironmentalWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfEnvironmentalWind.java index c9169e26..46d3ae38 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfEnvironmentalWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfEnvironmentalWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.SelfEnvironmentalWind; public class CSESelfEnvironmentalWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfOffensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfOffensiveWind.java index bd6a985e..78a5a021 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfOffensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSESelfOffensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.SelfOffensiveWind; public class CSESelfOffensiveWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefaultWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefaultWind.java index af38ff5e..041e9b12 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefaultWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefaultWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; public class CSEToolDefaultWind extends ComplexSpellEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefensiveWind.java index 51d562e0..c0e6aa1f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolDefensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ToolDefensiveWind; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolEnvironmentalWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolEnvironmentalWind.java index e6e0316f..dcdf3179 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolEnvironmentalWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolEnvironmentalWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ToolEnvironmentalWind; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolOffensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolOffensiveWind.java index 4bf9c2a2..b648c24f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolOffensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/cse/wind/CSEToolOffensiveWind.java @@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.api.spell.ComplexSpellEffect; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellModifier; import WayofTime.alchemicalWizardry.api.spell.ComplexSpellType; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind.ToolOffensiveWind; public class CSEToolOffensiveWind extends ComplexSpellEffect diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefaultEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefaultEarth.java index 1e2e9a43..7ca0d401 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefaultEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefaultEarth.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellCenteredWorldEffect; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellCenteredWorldEffect; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefensiveEarth.java index 385a3bc4..7be57961 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeDefensiveEarth.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellCenteredWorldEffect; import WayofTime.alchemicalWizardry.common.block.BlockTeleposer; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellCenteredWorldEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeEnvironmentalEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeEnvironmentalEarth.java index f201b7b4..32291181 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeEnvironmentalEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeEnvironmentalEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellCenteredWorldEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellCenteredWorldEffect; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeOffensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeOffensiveEarth.java index 266c6727..d13ab19c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeOffensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/MeleeOffensiveEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellCenteredWorldEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellCenteredWorldEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefaultEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefaultEarth.java index 738dcc68..8437f6d8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefaultEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefaultEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefensiveEarth.java index 59aff7e8..954c76e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileDefensiveEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileEnvironmentalEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileEnvironmentalEarth.java index 5dd9713a..721edd40 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileEnvironmentalEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileEnvironmentalEarth.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; -import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile; +import WayofTime.alchemicalWizardry.api.spell.EntitySpellProjectile; +import WayofTime.alchemicalWizardry.api.spell.ProjectileUpdateEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileOffensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileOffensiveEarth.java index cbbcd60f..37b3099b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileOffensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/ProjectileOffensiveEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefaultEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefaultEarth.java index bb952879..d32f7ace 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefaultEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefaultEarth.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.block.BlockTeleposer; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefensiveEarth.java index 24e0979c..cc3892b1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfDefensiveEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfEnvironmentalEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfEnvironmentalEarth.java index faaaa632..2dbc12ff 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfEnvironmentalEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfEnvironmentalEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfOffensiveEarth.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfOffensiveEarth.java index ebd74ea8..43726a4a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfOffensiveEarth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/earth/SelfOffensiveEarth.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.earth; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefaultFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefaultFire.java index 43f9ecdd..b045a199 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefaultFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefaultFire.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefensiveFire.java index b2191020..30ae1449 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeDefensiveFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellWorldEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellWorldEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeEnvironmentalFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeEnvironmentalFire.java index e022b5e1..9ef25810 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeEnvironmentalFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeEnvironmentalFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellCenteredWorldEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellCenteredWorldEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeOffensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeOffensiveFire.java index 7bd76de5..19a72332 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeOffensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/MeleeOffensiveFire.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; public class MeleeOffensiveFire extends ExtrapolatedMeleeEntityEffect { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefaultFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefaultFire.java index 039b5717..0f1316a3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefaultFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefaultFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefensiveFire.java index e3631712..020f143b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileDefensiveFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileEnvironmentalFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileEnvironmentalFire.java index 63403c18..dea915b5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileEnvironmentalFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileEnvironmentalFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.ProjectileUpdateEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect; import net.minecraft.entity.Entity; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileOffensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileOffensiveFire.java index ebe9bcd1..50e59136 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileOffensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ProjectileOffensiveFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefaultFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefaultFire.java index e9e66328..a5bc740b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefaultFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefaultFire.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefensiveFire.java index 80eaa62b..d93225f5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfDefensiveFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfEnvironmentalFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfEnvironmentalFire.java index bb3e2874..e933e17d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfEnvironmentalFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfEnvironmentalFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfOffensiveFire.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfOffensiveFire.java index ba014183..08641a38 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfOffensiveFire.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/SelfOffensiveFire.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefaultIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefaultIce.java index 29119824..b375331a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefaultIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefaultIce.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefensiveIce.java index a3cfdf53..0eb02f85 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeDefensiveIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellWorldEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellWorldEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeEnvironmentalIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeEnvironmentalIce.java index 886a47e2..1f735537 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeEnvironmentalIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeEnvironmentalIce.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntitySnowball; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeOffensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeOffensiveIce.java index 73f87771..cec308ec 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeOffensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/MeleeOffensiveIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefaultIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefaultIce.java index 78968f9d..6da5aec5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefaultIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefaultIce.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefensiveIce.java index 4eabb00b..c6659ff4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileDefensiveIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileEnvironmentalIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileEnvironmentalIce.java index 8a53613d..ad7a3ab6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileEnvironmentalIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileEnvironmentalIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; +import WayofTime.alchemicalWizardry.api.spell.ProjectileUpdateEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect; import net.minecraft.entity.Entity; import net.minecraft.util.Vec3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileOffensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileOffensiveIce.java index b23196db..97d47967 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileOffensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/ProjectileOffensiveIce.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefaultIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefaultIce.java index 6c01215f..8361a4f0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefaultIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefaultIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefensiveIce.java index 896c8ef9..cc9ab9e3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfDefensiveIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfEnvironmentalIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfEnvironmentalIce.java index 44207fcc..871fbc0a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfEnvironmentalIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfEnvironmentalIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfOffensiveIce.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfOffensiveIce.java index f57922ec..95072ab6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfOffensiveIce.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/ice/SelfOffensiveIce.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ice; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaEffect.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaEffect.java index b2e86b0b..a23b3e86 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaEffect.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/tool/DigAreaEffect.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.tool; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.items.spell.ItemSpellMultiTool; -import WayofTime.alchemicalWizardry.common.spell.complex.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefaultWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefaultWind.java index 2bf17e56..0108b356 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefaultWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefaultWind.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefensiveWind.java index cf2d7d93..34aef636 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeDefensiveWind.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeEnvironmentalWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeEnvironmentalWind.java index 1a3c3479..2faed36f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeEnvironmentalWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeEnvironmentalWind.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; +import WayofTime.alchemicalWizardry.api.spell.MeleeSpellCenteredWorldEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.MeleeSpellCenteredWorldEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeOffensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeOffensiveWind.java index 810a766f..8e2b32f5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeOffensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/MeleeOffensiveWind.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ExtrapolatedMeleeEntityEffect; +import WayofTime.alchemicalWizardry.api.spell.ExtrapolatedMeleeEntityEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileDefaultWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileDefaultWind.java index 61dbfda2..862b7193 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileDefaultWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileDefaultWind.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileEnvironmentalWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileEnvironmentalWind.java index 268e8d38..a11eeca5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileEnvironmentalWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileEnvironmentalWind.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; -import WayofTime.alchemicalWizardry.common.spell.complex.EntitySpellProjectile; +import WayofTime.alchemicalWizardry.api.spell.EntitySpellProjectile; +import WayofTime.alchemicalWizardry.api.spell.ProjectileUpdateEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileUpdateEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileOffensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileOffensiveWind.java index eecfaf64..77da2d79 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileOffensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/ProjectileOffensiveWind.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.ProjectileImpactEffect; +import WayofTime.alchemicalWizardry.api.spell.ProjectileImpactEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefaultWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefaultWind.java index 34176f08..9c8dff52 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefaultWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefaultWind.java @@ -1,6 +1,6 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefensiveWind.java index fdf5e6d7..819fdcd2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfDefensiveWind.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfEnvironmentalWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfEnvironmentalWind.java index 487fe396..351371c6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfEnvironmentalWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfEnvironmentalWind.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfOffensiveWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfOffensiveWind.java index 280b4d33..6fafe165 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfOffensiveWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/wind/SelfOffensiveWind.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.wind; +import WayofTime.alchemicalWizardry.api.spell.SelfSpellEffect; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.SelfSpellEffect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellEnhancementBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellEnhancementBlock.java index 04eb0208..576b1c52 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellEnhancementBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellEnhancementBlock.java @@ -1,10 +1,10 @@ package WayofTime.alchemicalWizardry.common.tileEntity; +import WayofTime.alchemicalWizardry.api.spell.SpellEnhancement; +import WayofTime.alchemicalWizardry.api.spell.SpellEnhancementCost; +import WayofTime.alchemicalWizardry.api.spell.SpellEnhancementPotency; +import WayofTime.alchemicalWizardry.api.spell.SpellEnhancementPower; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancement; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancementCost; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancementPotency; -import WayofTime.alchemicalWizardry.common.spell.complex.enhancement.SpellEnhancementPower; public class TESpellEnhancementBlock extends TESpellBlock { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java index 13d7f43b..f474d977 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java @@ -1,6 +1,10 @@ package WayofTime.alchemicalWizardry.common.tileEntity; import WayofTime.alchemicalWizardry.api.spell.SpellParadigm; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmMelee; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmProjectile; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmSelf; +import WayofTime.alchemicalWizardry.api.spell.SpellParadigmTool; import WayofTime.alchemicalWizardry.common.spell.complex.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiHandler.java index bff2754c..cb5908f9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiHandler.java @@ -4,15 +4,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiCategories; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiEntry; +import WayofTime.alchemicalWizardry.book.classes.guide.GuiIndex; +import WayofTime.alchemicalWizardry.book.compact.Category; +import WayofTime.alchemicalWizardry.book.registries.EntryRegistry; import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer; import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable; import WayofTime.alchemicalWizardry.common.tileEntity.container.ContainerTeleposer; import WayofTime.alchemicalWizardry.common.tileEntity.container.ContainerWritingTable; -import bloodutils.api.classes.guide.GuiCategories; -import bloodutils.api.classes.guide.GuiEntry; -import bloodutils.api.classes.guide.GuiIndex; -import bloodutils.api.compact.Category; -import bloodutils.api.registries.EntryRegistry; import cpw.mods.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler diff --git a/src/main/java/bloodutils/api/BUApi.java b/src/main/java/bloodutils/api/BUApi.java deleted file mode 100644 index b54343fa..00000000 --- a/src/main/java/bloodutils/api/BUApi.java +++ /dev/null @@ -1,4 +0,0 @@ -package bloodutils.api; - -public class BUApi { -} \ No newline at end of file diff --git a/src/main/java/bloodutils/api/enums/EnumType.java b/src/main/java/bloodutils/api/enums/EnumType.java deleted file mode 100644 index f534a6fe..00000000 --- a/src/main/java/bloodutils/api/enums/EnumType.java +++ /dev/null @@ -1,5 +0,0 @@ -package bloodutils.api.enums; - -public enum EnumType { - BLOCK, ITEM; -} \ No newline at end of file diff --git a/src/main/java/bloodutils/api/package-info.java b/src/main/java/bloodutils/api/package-info.java deleted file mode 100644 index a307cf7e..00000000 --- a/src/main/java/bloodutils/api/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(owner = "BloodUtils", apiVersion = "1.0c", provides = "BloodUtils|API") -package bloodutils.api; -import cpw.mods.fml.common.API; \ No newline at end of file