lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #298 from Arcaratus/master

Browse source 
Converted all TEAltar to IBloodAltar
This commit is contained in:
WayofTime 2015-04-10 11:02:00 -04:00
parent 833858d064 dee92b4c87
commit 003a65a51b
6 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/alchemicalWizardry/api/tile/IBloodAltar.java
View file

@ -34,4 +34,10 @@ public interface IBloodAltar
* @param amount * @param amount
*/ */
public void requestPauseAfterCrafting(int amount); public void requestPauseAfterCrafting(int amount);
public void addToDemonBloodDuration(int dur);
public boolean hasDemonBlood();
public void decrementDemonBlood();
} }

8
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java
View file

@ -6,7 +6,7 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; 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 WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -44,13 +44,13 @@ public class RitualEffectAutoAlchemy extends RitualEffect
int flag = 0; int flag = 0;
TileEntity topEntity = world.getTileEntity(x, y + 1, z); TileEntity topEntity = world.getTileEntity(x, y + 1, z);
if (!(topEntity instanceof TEAltar)) if (!(topEntity instanceof IBloodAltar))
{ {
return; return;
} }
TEAltar tileAltar = (TEAltar) topEntity; IBloodAltar altar = (IBloodAltar) topEntity;
ItemStack targetStack = tileAltar.getStackInSlot(0); ItemStack targetStack = altar.getStackInSlot(0);
if (targetStack == null) if (targetStack == null)
{ {
return; return;

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java
View file

@ -20,7 +20,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal; 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; import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
public class RitualEffectDemonPortal extends RitualEffect public class RitualEffectDemonPortal extends RitualEffect
@ -98,9 +98,9 @@ public class RitualEffectDemonPortal extends RitualEffect
public boolean checkCreatePortal(IMasterRitualStone ritualStone) public boolean checkCreatePortal(IMasterRitualStone ritualStone)
{ {
TileEntity entity = ritualStone.getWorld().getTileEntity(ritualStone.getXCoord(), ritualStone.getYCoord() + 1, ritualStone.getZCoord()); 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())) if(altar.hasDemonBlood() && ritualStone.getWorld().isAirBlock(ritualStone.getXCoord(), ritualStone.getYCoord() + 2, ritualStone.getZCoord()))
{ {
return true; return true;

8
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java
View file

@ -6,7 +6,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; 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.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -42,7 +42,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
return; return;
} }
TEAltar tileAltar = null; IBloodAltar tileAltar = null;
boolean testFlag = false; boolean testFlag = false;
for (int i = -5; i <= 5; i++) for (int i = -5; i <= 5; i++)
@ -51,9 +51,9 @@ public class RitualEffectFeatheredKnife extends RitualEffect
{ {
for (int k = -10; k <= 10; k++) 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; testFlag = true;
} }
} }

8
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java
View file

@ -6,7 +6,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; 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.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
@ -28,7 +28,7 @@ public class RitualEffectLifeConduit extends RitualEffect
int y = ritualStone.getYCoord(); int y = ritualStone.getYCoord();
int z = ritualStone.getZCoord(); int z = ritualStone.getZCoord();
TEAltar tileAltar = null; IBloodAltar tileAltar = null;
boolean testFlag = false; boolean testFlag = false;
for (int i = -5; i <= 5; i++) for (int i = -5; i <= 5; i++)
@ -37,9 +37,9 @@ public class RitualEffectLifeConduit extends RitualEffect
{ {
for (int k = -10; k <= 10; k++) 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; testFlag = true;
} }
} }

8
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java
View file

@ -5,7 +5,7 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; 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.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
@ -36,7 +36,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
return; return;
} }
TEAltar tileAltar = null; IBloodAltar tileAltar = null;
boolean testFlag = false; boolean testFlag = false;
for (int i = -5; i <= 5; i++) for (int i = -5; i <= 5; i++)
@ -45,9 +45,9 @@ public class RitualEffectWellOfSuffering extends RitualEffect
{ {
for (int k = -10; k <= 10; k++) 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; testFlag = true;
} }
} }