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

Implemented Well of Suffering. Tweaked AreaDescriptor slightly.

Browse source
This commit is contained in:
WayofTime 2015-12-31 16:01:47 -05:00
parent e8d1ff4997
commit 9a610cc023
3 changed files with 167 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java
View file

@ -7,7 +7,7 @@ import java.util.List;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
public class AreaDescriptor
public abstract class AreaDescriptor
{
public List<BlockPos> getContainedPositions(BlockPos pos)
{
@ -19,6 +19,10 @@ public class AreaDescriptor
return null;
}
public abstract void resetCache();
public abstract boolean isWithinArea(BlockPos pos);
public static class Rectangle extends AreaDescriptor
{
private BlockPos minimumOffset;
@ -27,6 +31,8 @@ public class AreaDescriptor
private ArrayList<BlockPos> blockPosCache = new ArrayList<BlockPos>();
private BlockPos cachedPosition = new BlockPos(0, 0, 0);
private boolean cache = true;
/**
* This constructor takes in the minimum and maximum BlockPos. The
* maximum offset is non-inclusive, meaning if you pass in (0,0,0) and
@ -53,7 +59,7 @@ public class AreaDescriptor
@Override
public List<BlockPos> getContainedPositions(BlockPos pos)
{
if (!pos.equals(cachedPosition) || blockPosCache.isEmpty())
if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty())
{
ArrayList<BlockPos> posList = new ArrayList<BlockPos>();
@ -95,5 +101,21 @@ public class AreaDescriptor
this.maximumOffset = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ()));
blockPosCache = new ArrayList<BlockPos>();
}
@Override
public void resetCache()
{
this.blockPosCache = new ArrayList<BlockPos>();
}
@Override
public boolean isWithinArea(BlockPos pos)
{
int x = pos.getX();
int y = pos.getY();
int z = pos.getZ();
return x >= minimumOffset.getX() && x < maximumOffset.getX() && y >= minimumOffset.getY() && y < maximumOffset.getY() && z >= minimumOffset.getZ() && z < maximumOffset.getZ();
}
}
}