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

Merge pull request #160 from Alex-hawks/master

Browse source 
Change Rituals to allow for TileEntity Runes, and Hybrid Runes
This commit is contained in:
WayofTime 2014-11-22 10:00:23 -05:00
parent 2f1e79aa5d 929d7e9abb
commit f138a8347e
4 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java
View file

@ -4,5 +4,5 @@ import net.minecraft.world.World;
public interface IRitualStone
{
public int getRuneType(World world, int x, int y, int z, int meta);
public boolean isRuneType(World world, int x, int y, int z, int meta, int runeType);
}

6
src/main/java/WayofTime/alchemicalWizardry/api/rituals/ITileRitualStone.java Normal file
View file

@ -0,0 +1,6 @@
package WayofTime.alchemicalWizardry.api.rituals;
public interface ITileRitualStone
{
public boolean isRuneType(int runeType);
}

38
src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java
View file

@ -7,6 +7,7 @@ import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import WayofTime.alchemicalWizardry.api.event.RitualRunEvent;
@ -149,6 +150,7 @@ public class Rituals
}
Block test = null;
TileEntity te = null;
switch (direction)
{
@ -156,13 +158,10 @@ public class Rituals
for (RitualComponent rc : ritual)
{
test = world.getBlock(x + rc.getX(), y + rc.getY(), z + rc.getZ());
te = world.getTileEntity(x + rc.getX(), y + rc.getY(), z + rc.getZ());
if (!(test instanceof IRitualStone))
{
return false;
}
if (((IRitualStone)test).getRuneType(world, x, y, z, world.getBlockMetadata(x + rc.getX(), y + rc.getY(), z + rc.getZ())) != rc.getStoneType())
if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x + rc.getX(), y + rc.getY(), z + rc.getZ()), rc.getStoneType()))
&& !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType())))
{
return false;
}
@ -174,13 +173,10 @@ public class Rituals
for (RitualComponent rc : ritual)
{
test = world.getBlock(x - rc.getZ(), y + rc.getY(), z + rc.getX());
te = world.getTileEntity(x - rc.getZ(), y + rc.getY(), z + rc.getX());
if (!(test instanceof IRitualStone))
{
return false;
}
if (((IRitualStone)test).getRuneType(world, x, y, z, world.getBlockMetadata(x - rc.getZ(), y + rc.getY(), z + rc.getX())) != rc.getStoneType())
if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x - rc.getZ(), y + rc.getY(), z + rc.getX()), rc.getStoneType()))
&& !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType())))
{
return false;
}
@ -192,13 +188,10 @@ public class Rituals
for (RitualComponent rc : ritual)
{
test = world.getBlock(x - rc.getX(), y + rc.getY(), z - rc.getZ());
te = world.getTileEntity(x - rc.getX(), y + rc.getY(), z - rc.getZ());
if (!(test instanceof IRitualStone))
{
return false;
}
if (((IRitualStone)test).getRuneType(world, x, y, z, world.getBlockMetadata(x - rc.getX(), y + rc.getY(), z - rc.getZ())) != rc.getStoneType())
if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x - rc.getX(), y + rc.getY(), z - rc.getZ()), rc.getStoneType()))
&& !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType())))
{
return false;
}
@ -210,13 +203,10 @@ public class Rituals
for (RitualComponent rc : ritual)
{
test = world.getBlock(x + rc.getZ(), y + rc.getY(), z - rc.getX());
te = world.getTileEntity(x + rc.getZ(), y + rc.getY(), z - rc.getX());
if (!(test instanceof IRitualStone))
{
return false;
}
if (((IRitualStone)test).getRuneType(world, x, y, z, world.getBlockMetadata(x + rc.getZ(), y + rc.getY(), z - rc.getX())) != rc.getStoneType())
if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x + rc.getZ(), y + rc.getY(), z - rc.getX()), rc.getStoneType()))
&& !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType())))
{
return false;
}

4
src/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java
View file

@ -120,8 +120,8 @@ public class RitualStone extends Block implements IRitualStone
}
@Override
public int getRuneType(World world, int x, int y, int z, int meta)
public boolean isRuneType(World world, int x, int y, int z, int meta, int runeType)
{
return meta;
return meta == runeType;
}
}