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

Finished almost all rituals.

Browse source
This commit is contained in:
WayofTime 2015-07-29 14:26:37 -04:00
parent 1fbebc56a2
commit 86b753d098
18 changed files with 321 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,7 @@ public class RitualEffectDemonPortal extends RitualEffect
{
if(rand.nextInt(10) == 0)
{
this.createRandomLightning(world, x, y, z);
this.createRandomLightning(world, pos.getX(), pos.getY(), pos.getZ());
}
reagentAmount += drainAmount;
@ -81,9 +81,9 @@ public class RitualEffectDemonPortal extends RitualEffect
if(reagentsFulfilled && checkCreatePortal(ritualStone))
{
world.setBlock(x, y+1, z, ModBlocks.blockDemonPortal);
world.setBlockState(pos.offsetUp(), ModBlocks.blockDemonPortal.getDefaultState());
TEDemonPortal portal = (TEDemonPortal) world.getTileEntity(x, y + 1, z);
TEDemonPortal portal = (TEDemonPortal) world.getTileEntity(pos.offsetUp());
portal.start();
ritualStone.setActive(false);
@ -95,11 +95,12 @@ public class RitualEffectDemonPortal extends RitualEffect
public boolean checkCreatePortal(IMasterRitualStone ritualStone)
{
TileEntity entity = ritualStone.getWorld().getTileEntity(ritualStone.getXCoord(), ritualStone.getYCoord() + 1, ritualStone.getZCoord());
BlockPos pos = ritualStone.getPosition();
TileEntity entity = ritualStone.getWorldObj().getTileEntity(pos.offsetUp());
if(entity instanceof IBloodAltar)
{
IBloodAltar altar = (IBloodAltar)entity;
if(altar.hasDemonBlood() && ritualStone.getWorld().isAirBlock(ritualStone.getXCoord(), ritualStone.getYCoord() + 2, ritualStone.getZCoord()))
if(altar.hasDemonBlood() && ritualStone.getWorldObj().isAirBlock(pos.offsetUp(2)))
{
return true;
}
@ -131,13 +132,11 @@ public class RitualEffectDemonPortal extends RitualEffect
public boolean checkJars(IMasterRitualStone ritualStone)
{
int x = ritualStone.getXCoord();
int y = ritualStone.getYCoord();
int z = ritualStone.getZCoord();
BlockPos position = ritualStone.getPosition();
for(Int3 pos : jarLocations)
{
if(!(ritualStone.getWorld().getTileEntity(x + pos.xCoord, y + pos.yCoord, z + pos.zCoord) instanceof TEBellJar))
if(!(ritualStone.getWorldObj().getTileEntity(position.add(pos.xCoord, pos.yCoord, pos.zCoord)) instanceof TEBellJar))
{
return false;
}