diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java index 926b06e5..bd1a6f58 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java @@ -8,14 +8,63 @@ import net.minecraft.util.BlockPos; public class AreaDescriptor { - - public List getContainedPositions() + public List getContainedPositions(BlockPos pos) { - return new ArrayList(); + return new ArrayList(); } - public AxisAlignedBB getAABB() + public AxisAlignedBB getAABB(BlockPos pos) { return null; } + + public static class Rectangle extends AreaDescriptor + { + private BlockPos minimumOffset; + private BlockPos maximumOffset; + + public Rectangle(BlockPos minimumOffset, BlockPos maximumOffset) + { + setOffsets(minimumOffset, maximumOffset); + } + + @Override + public List getContainedPositions(BlockPos pos) + { + ArrayList posList = new ArrayList(); + + for (int i = minimumOffset.getX(); i <= maximumOffset.getX(); i++) + { + for (int j = minimumOffset.getY(); j <= maximumOffset.getY(); j++) + { + for (int k = minimumOffset.getZ(); k <= maximumOffset.getZ(); k++) + { + posList.add(pos.add(i, j, k)); + } + } + } + + return posList; + } + + @Override + public AxisAlignedBB getAABB(BlockPos pos) + { + AxisAlignedBB tempAABB = new AxisAlignedBB(minimumOffset, maximumOffset); + return tempAABB.offset(pos.getX(), pos.getY(), pos.getZ()); + } + + /** + * Sets the offsets of the AreaDescriptor in a safe way that will make + * minimumOffset the lowest corner + * + * @param offset1 + * @param offset2 + */ + public void setOffsets(BlockPos offset1, BlockPos offset2) + { + this.minimumOffset = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); + this.maximumOffset = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java index 9b3113e5..76e5df61 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java @@ -31,7 +31,7 @@ public abstract class Ritual private final RitualRenderer renderer; private final String unlocalizedName; - private final Map modableRangeMap = new HashMap(); + private final Map modableRangeMap = new HashMap(); /** * @param name @@ -106,30 +106,26 @@ public abstract class Ritual return 20; } - public void addBlockRange(String range, BlockPos[] defaultRange) + public void addBlockRange(String range, AreaDescriptor defaultRange) { modableRangeMap.put(range, defaultRange); } /** - * Used to grab the range of a ritual for a given effect. The order of the - * blockPos array is: bottom corner, top corner. + * Used to grab the range of a ritual for a given effect. * * @param range * - Range that needs to be pulled. - * @return - The range of the ritual effect. Array must be of size 2 and - * have non-null values, with the first BlockPos having the lower - * offset values and the second BlockPos having the higher offset - * values + * @return - */ - public BlockPos[] getBlockRange(String range) + public AreaDescriptor getBlockRange(String range) { if (modableRangeMap.containsKey(range)) { return modableRangeMap.get(range); } - return new BlockPos[] { new BlockPos(0, 0, 0), new BlockPos(0, 0, 0) }; + return null; } /** diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index cfcb4e9a..6f09817c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -11,6 +11,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.AreaDescriptor; import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; import WayofTime.bloodmagic.api.ritual.Ritual; @@ -25,7 +26,7 @@ public class RitualGreenGrove extends Ritual public RitualGreenGrove() { super("ritualGreenGrove", 0, 1000, "ritual." + Constants.Mod.MODID + ".greenGroveRitual"); - addBlockRange(GROW_RANGE, new BlockPos[] { new BlockPos(-1, 2, -1), new BlockPos(1, 2, 1) }); + addBlockRange(GROW_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 2, -1), new BlockPos(1, 2, 1))); } @Override @@ -41,33 +42,16 @@ public class RitualGreenGrove extends Ritual int maxGrowths = currentEssence / getRefreshCost(); int totalGrowths = 0; - BlockPos[] growingRange = getBlockRange(GROW_RANGE); + AreaDescriptor growingRange = getBlockRange(GROW_RANGE); - for (int i = growingRange[0].getX(); i <= growingRange[1].getX(); i++) + for(BlockPos newPos : growingRange.getContainedPositions(masterRitualStone.getPos())) { - for (int j = growingRange[0].getY(); j <= growingRange[1].getY(); j++) + IBlockState state = world.getBlockState(newPos); + Block block = state.getBlock(); + if (block instanceof IPlantable || block instanceof IGrowable) { - for (int k = growingRange[0].getZ(); k <= growingRange[1].getZ(); k++) - { - BlockPos newPos = masterRitualStone.getPos().add(i, j, k); - IBlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - if (block instanceof IPlantable || block instanceof IGrowable) - { - block.updateTick(world, newPos, state, new Random()); - totalGrowths++; - } - - if (totalGrowths >= maxGrowths) - { - break; - } - } - - if (totalGrowths >= maxGrowths) - { - break; - } + block.updateTick(world, newPos, state, new Random()); + totalGrowths++; } if (totalGrowths >= maxGrowths)