From 909bff5b2098a542ac07e0a18b6fd048e53eb995 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:47:30 -0400 Subject: [PATCH 1/8] IBloodAltar cleanup --- .../common/rituals/RitualEffectAutoAlchemy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java index 11c9a419..c1ef9329 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java @@ -6,7 +6,7 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -44,12 +44,12 @@ public class RitualEffectAutoAlchemy extends RitualEffect int flag = 0; TileEntity topEntity = world.getTileEntity(x, y + 1, z); - if (!(topEntity instanceof TEAltar)) + if (!(topEntity instanceof IBloodAltar)) { return; } - TEAltar tileAltar = (TEAltar) topEntity; + IBloodAltar altar = (IBloodAltar) topEntity; ItemStack targetStack = tileAltar.getStackInSlot(0); if (targetStack == null) { From 5951f4a236b57546794514dd7d2b135a17ed0d99 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:47:51 -0400 Subject: [PATCH 2/8] IBloodAltar cleanup --- .../common/rituals/RitualEffectAutoAlchemy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java index c1ef9329..3c2a187a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java @@ -50,7 +50,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect } IBloodAltar altar = (IBloodAltar) topEntity; - ItemStack targetStack = tileAltar.getStackInSlot(0); + ItemStack targetStack = altar.getStackInSlot(0); if (targetStack == null) { return; From 7443e3f16705a0cb6cf6aeeffb7b255288fb11ea Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:49:35 -0400 Subject: [PATCH 3/8] IBloodAltar cleanup --- .../common/rituals/RitualEffectDemonPortal.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java index b74df1c2..e59ef368 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java @@ -20,7 +20,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; public class RitualEffectDemonPortal extends RitualEffect @@ -98,9 +98,9 @@ public class RitualEffectDemonPortal extends RitualEffect public boolean checkCreatePortal(IMasterRitualStone ritualStone) { TileEntity entity = ritualStone.getWorld().getTileEntity(ritualStone.getXCoord(), ritualStone.getYCoord() + 1, ritualStone.getZCoord()); - if(entity instanceof TEAltar) + if(entity instanceof IBloodAltar) { - TEAltar altar = (TEAltar)entity; + IBloodAltar altar = (IBloodAltar)entity; if(altar.hasDemonBlood() && ritualStone.getWorld().isAirBlock(ritualStone.getXCoord(), ritualStone.getYCoord() + 2, ritualStone.getZCoord())) { return true; From 76f9d83e4b1089677c34ed8e43f4ef4fc35efb09 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:52:15 -0400 Subject: [PATCH 4/8] IBloodAltar cleanup --- .../WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java b/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java index baa0ed7a..265b7cf7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java @@ -34,4 +34,10 @@ public interface IBloodAltar * @param amount */ public void requestPauseAfterCrafting(int amount); + + public void addToDemonBloodDuration(int dur); + + public boolean hasDemonBlood(); + + public void decrementDemonBlood(); } From b20359ac487e5ca8fe88de05aa51a1f0dda7f891 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:53:23 -0400 Subject: [PATCH 5/8] IBloodAltar cleanup --- .../common/rituals/RitualEffectFeatheredKnife.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java index 8961b779..a5befc6d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java @@ -6,7 +6,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -42,7 +42,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect return; } - TEAltar tileAltar = null; + IBloodAltar tileAltar = null; boolean testFlag = false; for (int i = -5; i <= 5; i++) @@ -51,7 +51,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect { for (int k = -10; k <= 10; k++) { - if (world.getTileEntity(x + i, y + k, z + j) instanceof TEAltar) + if (world.getTileEntity(x + i, y + k, z + j) instanceof IBloodAltar) { tileAltar = (TEAltar) world.getTileEntity(x + i, y + k, z + j); testFlag = true; From 05a9822f7cbf59d496e3d3d46994a24bea6c619f Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:53:45 -0400 Subject: [PATCH 6/8] IBloodAltar cleanup --- .../common/rituals/RitualEffectFeatheredKnife.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java index a5befc6d..35df70c8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java @@ -53,7 +53,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect { if (world.getTileEntity(x + i, y + k, z + j) instanceof IBloodAltar) { - tileAltar = (TEAltar) world.getTileEntity(x + i, y + k, z + j); + tileAltar = (IBloodAltar) world.getTileEntity(x + i, y + k, z + j); testFlag = true; } } From 9c11124de72ecc233d7a5761dd6fc494b2bee849 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:55:02 -0400 Subject: [PATCH 7/8] IBloodAltar cleanup --- .../common/rituals/RitualEffectLifeConduit.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java index 126a8375..cedfd89e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java @@ -6,7 +6,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -28,7 +28,7 @@ public class RitualEffectLifeConduit extends RitualEffect int y = ritualStone.getYCoord(); int z = ritualStone.getZCoord(); - TEAltar tileAltar = null; + IBloodAltar tileAltar = null; boolean testFlag = false; for (int i = -5; i <= 5; i++) @@ -37,9 +37,9 @@ public class RitualEffectLifeConduit extends RitualEffect { for (int k = -10; k <= 10; k++) { - if (world.getTileEntity(x + i, y + k, z + j) instanceof TEAltar) + if (world.getTileEntity(x + i, y + k, z + j) instanceof IBloodAltar) { - tileAltar = (TEAltar) world.getTileEntity(x + i, y + k, z + j); + tileAltar = (IBloodAltar) world.getTileEntity(x + i, y + k, z + j); testFlag = true; } } From dee92b4c870907ee7f62a8eb56eefb3c2840e2eb Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Apr 2015 10:56:15 -0400 Subject: [PATCH 8/8] IBloodAltar cleanup --- .../common/rituals/RitualEffectWellOfSuffering.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java index dfc0516d..e2176079 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java @@ -5,7 +5,7 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; @@ -36,7 +36,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect return; } - TEAltar tileAltar = null; + IBloodAltar tileAltar = null; boolean testFlag = false; for (int i = -5; i <= 5; i++) @@ -45,9 +45,9 @@ public class RitualEffectWellOfSuffering extends RitualEffect { for (int k = -10; k <= 10; k++) { - if (world.getTileEntity(x + i, y + k, z + j) instanceof TEAltar) + if (world.getTileEntity(x + i, y + k, z + j) instanceof IBloodAltar) { - tileAltar = (TEAltar) world.getTileEntity(x + i, y + k, z + j); + tileAltar = (IBloodAltar) world.getTileEntity(x + i, y + k, z + j); testFlag = true; } }