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

Added getHeight() to AreaDescriptor, Jumping power modifyable (#1608)

Browse source
This commit is contained in:
Tobias 2019-05-19 16:59:25 +00:00 committed by Nick Ignoffo
parent 28057bd3f6
commit 1d52a137d5
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java
View file

@ -41,6 +41,8 @@ public abstract class AreaDescriptor implements Iterator<BlockPos> {
public abstract int getVolume();
public abstract int getHeight();
public abstract boolean isWithinRange(int verticalLimit, int horizontalLimit);
/**
@ -115,6 +117,11 @@ public abstract class AreaDescriptor implements Iterator<BlockPos> {
return tempAABB.offset(pos.getX(), pos.getY(), pos.getZ());
}
@Override
public int getHeight() {
return this.maximumOffset.getY() - this.minimumOffset.getY();
}
/**
* Sets the offsets of the AreaDescriptor in a safe way that will make
* minimumOffset the lowest corner
@ -270,6 +277,13 @@ public abstract class AreaDescriptor implements Iterator<BlockPos> {
blockPosCache = new ArrayList<>();
}
@Override
public int getHeight() {
return this.radius * 2;
}
@Override
public List<BlockPos> getContainedPositions(BlockPos pos) {
if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) {
@ -403,6 +417,12 @@ public abstract class AreaDescriptor implements Iterator<BlockPos> {
this.blockPosCache = new ArrayList<>();
}
@Override
public int getHeight() {
return this.size * 2 + 1;
}
@Override
public List<BlockPos> getContainedPositions(BlockPos pos) {
if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) {

7
src/main/java/WayofTime/bloodmagic/ritual/types/RitualJumping.java
View file

@ -14,11 +14,14 @@ import java.util.function.Consumer;
@RitualRegister("jumping")
public class RitualJumping extends Ritual {
public static final String JUMP_RANGE = "jumpRange";
public static final String JUMP_POWER = "jumpPower";
public RitualJumping() {
super("ritualJump", 0, 5000, "ritual." + BloodMagic.MODID + ".jumpRitual");
addBlockRange(JUMP_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3, 1, 3));
setMaximumVolumeAndDistanceOfRange(JUMP_RANGE, 0, 5, 5);
addBlockRange(JUMP_POWER, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 0, 5, 0));
setMaximumVolumeAndDistanceOfRange(JUMP_POWER, 0, 0, 100);
}
@Override
@ -41,7 +44,7 @@ public class RitualJumping extends Ritual {
break;
}
double motionY = 1.5;
double motionY = masterRitualStone.getBlockRange(JUMP_POWER).getHeight() * 0.3;
entity.fallDistance = 0;
if (entity.isSneaking()) {
@ -66,7 +69,7 @@ public class RitualJumping extends Ritual {
@Override
public int getRefreshCost() {
return 5;
return getBlockRange(JUMP_POWER).getHeight();
}
@Override