From dd9552359754ce2f5d3efd1b6a42a023f518616a Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 2 Apr 2014 19:17:57 -0400 Subject: [PATCH] Alchemy Set Registry --- .../alchemicalWizardry/AlchemicalWizardry.java | 2 +- .../alchemy/AlchemyPotionHelper.java | 2 +- .../{common => api}/alchemy/AlchemyRecipe.java | 2 +- .../alchemy/AlchemyRecipeRegistry.java | 16 ++++++++-------- .../common/items/ActivationCrystal.java | 2 +- .../common/items/ItemAlchemyBase.java | 2 +- .../common/items/ItemComplexSpellCrystal.java | 2 +- .../common/items/ItemComponents.java | 2 +- .../common/items/potion/AlchemyFlask.java | 2 +- .../common/items/potion/AlchemyReagent.java | 2 +- .../common/items/potion/LengtheningCatalyst.java | 2 +- .../common/items/potion/PowerCatalyst.java | 2 +- .../items/potion/StandardBindingAgent.java | 2 +- .../common/items/potion/WeakFillingAgent.java | 2 +- .../common/rituals/RitualEffectAutoAlchemy.java | 2 +- .../common/tileEntity/TEWritingTable.java | 2 +- .../nei/NEIAlchemyRecipeHandler.java | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) rename BM_src/WayofTime/alchemicalWizardry/{common => api}/alchemy/AlchemyPotionHelper.java (97%) rename BM_src/WayofTime/alchemicalWizardry/{common => api}/alchemy/AlchemyRecipe.java (98%) rename BM_src/WayofTime/alchemicalWizardry/{common => api}/alchemy/AlchemyRecipeRegistry.java (80%) diff --git a/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index ff4032d3..6b62fa9b 100644 --- a/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -22,6 +22,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ItemApi; import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.Rituals; @@ -43,7 +44,6 @@ import WayofTime.alchemicalWizardry.common.PotionInhibit; import WayofTime.alchemicalWizardry.common.PotionPlanarBinding; import WayofTime.alchemicalWizardry.common.PotionProjectileProtect; import WayofTime.alchemicalWizardry.common.PotionReciprocation; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.block.ArmourForge; import WayofTime.alchemicalWizardry.common.block.LifeEssenceBlock; import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyPotionHelper.java b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyPotionHelper.java similarity index 97% rename from BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyPotionHelper.java rename to BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyPotionHelper.java index 47bcd609..d3462552 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyPotionHelper.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyPotionHelper.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.alchemy; +package WayofTime.alchemicalWizardry.api.alchemy; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipe.java similarity index 98% rename from BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java rename to BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipe.java index 2a54f091..3dfdba40 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.alchemy; +package WayofTime.alchemicalWizardry.api.alchemy; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipeRegistry.java b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipeRegistry.java similarity index 80% rename from BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipeRegistry.java rename to BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipeRegistry.java index fc88a0e1..1b9871d9 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipeRegistry.java +++ b/BM_src/WayofTime/alchemicalWizardry/api/alchemy/AlchemyRecipeRegistry.java @@ -1,11 +1,11 @@ -package WayofTime.alchemicalWizardry.common.alchemy; - -import WayofTime.alchemicalWizardry.common.items.EnergyBattery; -import net.minecraft.item.ItemStack; +package WayofTime.alchemicalWizardry.api.alchemy; import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; + public class AlchemyRecipeRegistry { public static List recipes = new ArrayList(); @@ -22,12 +22,12 @@ public class AlchemyRecipeRegistry return null; } - if (!(bloodOrb.getItem() instanceof EnergyBattery)) + if (!(bloodOrb.getItem() instanceof IBloodOrb)) { return null; } - int bloodOrbLevel = ((EnergyBattery) bloodOrb.getItem()).getOrbLevel(); + int bloodOrbLevel = ((IBloodOrb) bloodOrb.getItem()).getOrbLevel(); for (AlchemyRecipe ar : recipes) { @@ -47,12 +47,12 @@ public class AlchemyRecipeRegistry return 0; } - if (!(bloodOrb.getItem() instanceof EnergyBattery)) + if (!(bloodOrb.getItem() instanceof IBloodOrb)) { return 0; } - int bloodOrbLevel = ((EnergyBattery) bloodOrb.getItem()).getOrbLevel(); + int bloodOrbLevel = ((IBloodOrb) bloodOrb.getItem()).getOrbLevel(); for (AlchemyRecipe ar : recipes) { diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/BM_src/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index f62c4043..6bae5174 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java index 8e910525..0b1caf25 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java @@ -15,7 +15,7 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java index 8962b1f4..abab2db6 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComponents.java b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComponents.java index dfaa9c4c..d81112b8 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComponents.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/ItemComponents.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java index 6d6342d3..a9de5b95 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java @@ -1,7 +1,7 @@ package WayofTime.alchemicalWizardry.common.items.potion; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyPotionHelper; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyPotionHelper; import com.google.common.collect.HashMultimap; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java index 1c8ec262..eda46fe9 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java @@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.potion; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java index 8287ac84..1f8f37d5 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.items.potion; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.ICatalyst; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java index 44797fba..226bd998 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.items.potion; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.ICatalyst; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java index 589911b9..e38e0651 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.items.potion; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.IBindingAgent; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java index e5fe7e4b..cc7a74a8 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java @@ -1,8 +1,8 @@ package WayofTime.alchemicalWizardry.common.items.potion; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.IFillingAgent; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java index ceeb640d..1038126c 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java @@ -8,10 +8,10 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable; diff --git a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java index d2c01f01..8c5b9aa2 100644 --- a/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java +++ b/BM_src/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java @@ -16,11 +16,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.IBindingAgent; import WayofTime.alchemicalWizardry.common.ICatalyst; import WayofTime.alchemicalWizardry.common.IFillingAgent; import WayofTime.alchemicalWizardry.common.PacketHandler; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.common.items.EnergyBattery; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.items.potion.AlchemyFlask; diff --git a/BM_src/joshie/alchemicalWizardy/nei/NEIAlchemyRecipeHandler.java b/BM_src/joshie/alchemicalWizardy/nei/NEIAlchemyRecipeHandler.java index c39080ea..b21ec47c 100644 --- a/BM_src/joshie/alchemicalWizardy/nei/NEIAlchemyRecipeHandler.java +++ b/BM_src/joshie/alchemicalWizardy/nei/NEIAlchemyRecipeHandler.java @@ -8,8 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipe; -import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipe; +import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler;