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

Fixed RitualReader (RitualTinkerer) area setting ability. (#1505)

Browse source 
* Fixed RitualReader (RitualTinkerer) area setting ability.

Signed-off-by: tobias <angryaeon@icloud.com>

* Update TileMasterRitualStone.java

* Interface tidied up
This commit is contained in:
Tobias Gremeyer 2019-01-22 00:06:38 +01:00 committed by Nick Ignoffo
parent 399c2723d3
commit 415d3f1f42
33 changed files with 106 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/WayofTime/bloodmagic/ritual/IMasterRitualStone.java
View file

@ -9,7 +9,9 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
/** /**
@ -22,6 +24,8 @@ public interface IMasterRitualStone {
SoulNetwork getOwnerNetwork(); SoulNetwork getOwnerNetwork();
Map<String, AreaDescriptor> modableRangeMap = new HashMap<>();
boolean activateRitual(ItemStack activationCrystal, EntityPlayer activator, Ritual ritual); boolean activateRitual(ItemStack activationCrystal, EntityPlayer activator, Ritual ritual);
void performRitual(World world, BlockPos pos); void performRitual(World world, BlockPos pos);
@ -61,4 +65,10 @@ public interface IMasterRitualStone {
default SoulTicket ticket(int amount) { default SoulTicket ticket(int amount) {
return SoulTicket.block(getWorldObj(), getBlockPos(), amount); return SoulTicket.block(getWorldObj(), getBlockPos(), amount);
} }
AreaDescriptor getBlockRange(String range);
void addBlockRanges(Map<String, AreaDescriptor> blockRanges);
void addBlockRange(String range, AreaDescriptor defaultRange);
} }

16
src/main/java/WayofTime/bloodmagic/ritual/Ritual.java
View file

@ -15,6 +15,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.function.BiFunction;
import java.util.function.Consumer; import java.util.function.Consumer;
/** /**
@ -185,20 +186,7 @@ public abstract class Ritual {
return rangeList.get(0); return rangeList.get(0);
} }
public boolean setBlockRangeByBounds(String range, IMasterRitualStone master, BlockPos offset1, BlockPos offset2) { public boolean canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) {
AreaDescriptor descriptor = this.getBlockRange(range);
World world = master.getWorldObj();
BlockPos masterPos = master.getBlockPos();
DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, masterPos);
if (canBlockRangeBeModified(range, descriptor, master, offset1, offset2, holder)) {
descriptor.modifyAreaByBlockPositions(offset1, offset2);
return true;
}
return false;
}
protected boolean canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) {
List<EnumDemonWillType> willConfig = master.getActiveWillConfig(); List<EnumDemonWillType> willConfig = master.getActiveWillConfig();
int maxVolume = getMaxVolumeForRange(range, willConfig, holder); int maxVolume = getMaxVolumeForRange(range, willConfig, holder);
int maxVertical = getMaxVerticalRadiusForRange(range, willConfig, holder); int maxVertical = getMaxVerticalRadiusForRange(range, willConfig, holder);

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java
View file

@ -56,7 +56,7 @@ public class RitualAnimalGrowth extends Ritual {
int totalGrowths = 0; int totalGrowths = 0;
BlockPos pos = masterRitualStone.getBlockPos(); BlockPos pos = masterRitualStone.getBlockPos();
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE);
TileEntity chest = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); TileEntity chest = world.getTileEntity(chestRange.getContainedPositions(pos).get(0));
IItemHandler itemHandler = null; IItemHandler itemHandler = null;
if (chest != null) { if (chest != null) {
@ -83,7 +83,7 @@ public class RitualAnimalGrowth extends Ritual {
boolean breedAnimals = steadfastWill >= steadfastWillDrain && itemHandler != null; boolean breedAnimals = steadfastWill >= steadfastWillDrain && itemHandler != null;
boolean kamikaze = destructiveWill >= destructiveWillDrain; boolean kamikaze = destructiveWill >= destructiveWillDrain;
AreaDescriptor growingRange = getBlockRange(GROWTH_RANGE); AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROWTH_RANGE);
AxisAlignedBB axis = growingRange.getAABB(masterRitualStone.getBlockPos()); AxisAlignedBB axis = growingRange.getAABB(masterRitualStone.getBlockPos());
List<EntityAnimal> animalList = world.getEntitiesWithinAABB(EntityAnimal.class, axis); List<EntityAnimal> animalList = world.getEntitiesWithinAABB(EntityAnimal.class, axis);

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualArmourEvolve.java
View file

@ -33,7 +33,7 @@ public class RitualArmourEvolve extends Ritual {
BlockPos pos = masterRitualStone.getBlockPos(); BlockPos pos = masterRitualStone.getBlockPos();
AreaDescriptor checkRange = getBlockRange(CHECK_RANGE); AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE);
List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos)); List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos));

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualCobblestone.java
View file

@ -37,7 +37,7 @@ public class RitualCobblestone extends Ritual {
int maxEffects = currentEssence / getRefreshCost(); int maxEffects = currentEssence / getRefreshCost();
int totalEffects = 0; int totalEffects = 0;
AreaDescriptor cobblestoneRange = getBlockRange(COBBLESTONE_RANGE); AreaDescriptor cobblestoneRange = masterRitualStone.getBlockRange(COBBLESTONE_RANGE);
if (tileEntity != null && tileEntity instanceof TileAlchemyArray) { if (tileEntity != null && tileEntity instanceof TileAlchemyArray) {
TileAlchemyArray alchemyArray = (TileAlchemyArray) tileEntity; TileAlchemyArray alchemyArray = (TileAlchemyArray) tileEntity;

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualCondor.java
View file

@ -24,7 +24,7 @@ public class RitualCondor extends Ritual {
@Override @Override
public void performRitual(IMasterRitualStone masterRitualStone) { public void performRitual(IMasterRitualStone masterRitualStone) {
AxisAlignedBB aabb = getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()).expand(-10, 0, -10); AxisAlignedBB aabb = masterRitualStone.getBlockRange(FLIGHT_RANGE).getAABB(masterRitualStone.getBlockPos()).expand(-10, 0, -10);
World world = masterRitualStone.getWorldObj(); World world = masterRitualStone.getWorldObj();
int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence();
@ -52,7 +52,7 @@ public class RitualCondor extends Ritual {
@Override @Override
public int getRefreshCost() { public int getRefreshCost() {
return getBlockRange(FLIGHT_RANGE).getVolume() / 10000; // cost of 2 LP per second per player with default configuration return 5;
} }
@Override @Override

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualContainment.java
View file

@ -29,7 +29,7 @@ public class RitualContainment extends Ritual {
return; return;
} }
AreaDescriptor containmentRange = getBlockRange(CONTAINMENT_RANGE); AreaDescriptor containmentRange = masterRitualStone.getBlockRange(CONTAINMENT_RANGE);
for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, containmentRange.getAABB(masterRitualStone.getBlockPos()))) { for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, containmentRange.getAABB(masterRitualStone.getBlockPos()))) {
if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner())))

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java
View file

@ -70,7 +70,7 @@ public class RitualCrushing extends Ritual {
} }
BlockPos pos = masterRitualStone.getBlockPos(); BlockPos pos = masterRitualStone.getBlockPos();
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE);
TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0));
if (tile != null && Utils.getNumberOfFreeSlots(tile, EnumFacing.DOWN) < 1) { if (tile != null && Utils.getNumberOfFreeSlots(tile, EnumFacing.DOWN) < 1) {
@ -94,7 +94,7 @@ public class RitualCrushing extends Ritual {
int fortune = destructiveWill > 0 ? 3 : 0; int fortune = destructiveWill > 0 ? 3 : 0;
AreaDescriptor crushingRange = getBlockRange(CRUSHING_RANGE); AreaDescriptor crushingRange = masterRitualStone.getBlockRange(CRUSHING_RANGE);
boolean hasOperated = false; boolean hasOperated = false;
double rawDrain = 0; double rawDrain = 0;

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalHarvest.java
View file

@ -35,7 +35,7 @@ public class RitualCrystalHarvest extends Ritual {
int maxEffects = 1; int maxEffects = 1;
int totalEffects = 0; int totalEffects = 0;
AreaDescriptor crystalRange = getBlockRange(CRYSTAL_RANGE); AreaDescriptor crystalRange = masterRitualStone.getBlockRange(CRYSTAL_RANGE);
crystalRange.resetIterator(); crystalRange.resetIterator();
while (crystalRange.hasNext()) { while (crystalRange.hasNext()) {

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualEllipsoid.java
View file

@ -42,7 +42,7 @@ public class RitualEllipsoid extends Ritual
int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence();
BlockPos masterPos = masterRitualStone.getBlockPos(); BlockPos masterPos = masterRitualStone.getBlockPos();
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE);
TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0));
if (currentEssence < getRefreshCost()) if (currentEssence < getRefreshCost())
@ -51,7 +51,7 @@ public class RitualEllipsoid extends Ritual
return; return;
} }
AreaDescriptor sphereRange = getBlockRange(SPHEROID_RANGE); AreaDescriptor sphereRange = masterRitualStone.getBlockRange(SPHEROID_RANGE);
AxisAlignedBB sphereBB = sphereRange.getAABB(masterPos); AxisAlignedBB sphereBB = sphereRange.getAABB(masterPos);
int minX = (int) (masterPos.getX() - sphereBB.minX); int minX = (int) (masterPos.getX() - sphereBB.minX);
int maxX = (int) (sphereBB.maxX - masterPos.getX()) - 1; int maxX = (int) (sphereBB.maxX - masterPos.getX()) - 1;

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualExpulsion.java
View file

@ -48,7 +48,7 @@ public class RitualExpulsion extends Ritual {
if (masterRitualStone.getWorldObj().isRemote) if (masterRitualStone.getWorldObj().isRemote)
return; return;
AreaDescriptor expulsionRange = getBlockRange(EXPULSION_RANGE); AreaDescriptor expulsionRange = masterRitualStone.getBlockRange(EXPULSION_RANGE);
List<UUID> whitelist = Lists.newArrayList(); List<UUID> whitelist = Lists.newArrayList();
BlockPos masterPos = masterRitualStone.getBlockPos(); BlockPos masterPos = masterRitualStone.getBlockPos();

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java
View file

@ -80,7 +80,7 @@ public class RitualFeatheredKnife extends Ritual {
TileEntity tile = world.getTileEntity(altarPos); TileEntity tile = world.getTileEntity(altarPos);
AreaDescriptor altarRange = getBlockRange(ALTAR_RANGE); AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE);
if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof IBloodAltar)) { if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof IBloodAltar)) {
for (BlockPos newPos : altarRange.getContainedPositions(pos)) { for (BlockPos newPos : altarRange.getContainedPositions(pos)) {
@ -100,7 +100,7 @@ public class RitualFeatheredKnife extends Ritual {
if (tile instanceof IBloodAltar) { if (tile instanceof IBloodAltar) {
IBloodAltar tileAltar = (IBloodAltar) tile; IBloodAltar tileAltar = (IBloodAltar) tile;
AreaDescriptor damageRange = getBlockRange(DAMAGE_RANGE); AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE);
AxisAlignedBB range = damageRange.getAABB(pos); AxisAlignedBB range = damageRange.getAABB(pos);
double destructiveDrain = 0; double destructiveDrain = 0;

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualFelling.java
View file

@ -46,7 +46,7 @@ public class RitualFelling extends Ritual {
int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence();
BlockPos masterPos = masterRitualStone.getBlockPos(); BlockPos masterPos = masterRitualStone.getBlockPos();
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE);
TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0));
if (currentEssence < getRefreshCost()) { if (currentEssence < getRefreshCost()) {
@ -55,7 +55,7 @@ public class RitualFelling extends Ritual {
} }
if (!cached || treePartsCache.isEmpty()) { if (!cached || treePartsCache.isEmpty()) {
for (BlockPos blockPos : getBlockRange(FELLING_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { for (BlockPos blockPos : masterRitualStone.getBlockRange(FELLING_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) {
if (!treePartsCache.contains(blockPos)) if (!treePartsCache.contains(blockPos))
if (!world.isAirBlock(blockPos) && (world.getBlockState(blockPos).getBlock().isWood(world, blockPos) || world.getBlockState(blockPos).getBlock().isLeaves(world.getBlockState(blockPos), world, blockPos))) { if (!world.isAirBlock(blockPos) && (world.getBlockState(blockPos).getBlock().isWood(world, blockPos) || world.getBlockState(blockPos).getBlock().isLeaves(world.getBlockState(blockPos), world, blockPos))) {
treePartsCache.add(blockPos); treePartsCache.add(blockPos);

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java
View file

@ -86,7 +86,7 @@ public class RitualForsakenSoul extends Ritual {
List<TileDemonCrystal> crystalList = new ArrayList<>(); List<TileDemonCrystal> crystalList = new ArrayList<>();
AreaDescriptor crystalRange = getBlockRange(CRYSTAL_RANGE); AreaDescriptor crystalRange = masterRitualStone.getBlockRange(CRYSTAL_RANGE);
crystalRange.resetIterator(); crystalRange.resetIterator();
while (crystalRange.hasNext()) { while (crystalRange.hasNext()) {
@ -97,7 +97,7 @@ public class RitualForsakenSoul extends Ritual {
} }
} }
AreaDescriptor damageRange = getBlockRange(DAMAGE_RANGE); AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE);
AxisAlignedBB range = damageRange.getAABB(pos); AxisAlignedBB range = damageRange.getAABB(pos);
List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, range); List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, range);

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualFullStomach.java
View file

@ -39,14 +39,14 @@ public class RitualFullStomach extends Ritual {
int maxEffects = currentEssence / getRefreshCost(); int maxEffects = currentEssence / getRefreshCost();
int totalEffects = 0; int totalEffects = 0;
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE);
TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0));
if (tile == null || !tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) if (tile == null || !tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null))
return; return;
IItemHandler inventory = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); IItemHandler inventory = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
int lastSlot = 0; int lastSlot = 0;
AreaDescriptor fillingRange = getBlockRange(FILL_RANGE); AreaDescriptor fillingRange = masterRitualStone.getBlockRange(FILL_RANGE);
List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, fillingRange.getAABB(pos)); List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, fillingRange.getAABB(pos));
for (EntityPlayer player : playerList) { for (EntityPlayer player : playerList) {

6
src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java
View file

@ -80,7 +80,7 @@ public class RitualGreenGrove extends Ritual {
double rawDrain = 0; double rawDrain = 0;
double vengefulDrain = 0; double vengefulDrain = 0;
AreaDescriptor growingRange = getBlockRange(GROW_RANGE); AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROW_RANGE);
int maxGrowthVolume = getMaxVolumeForRange(GROW_RANGE, willConfig, holder); int maxGrowthVolume = getMaxVolumeForRange(GROW_RANGE, willConfig, holder);
if (!growingRange.isWithinRange(getMaxVerticalRadiusForRange(GROW_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(GROW_RANGE, willConfig, holder)) || (maxGrowthVolume != 0 && growingRange.getVolume() > maxGrowthVolume)) { if (!growingRange.isWithinRange(getMaxVerticalRadiusForRange(GROW_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(GROW_RANGE, willConfig, holder)) || (maxGrowthVolume != 0 && growingRange.getVolume() > maxGrowthVolume)) {
@ -126,7 +126,7 @@ public class RitualGreenGrove extends Ritual {
WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true); WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true);
} }
AreaDescriptor hydrateRange = getBlockRange(HYDRATE_RANGE); AreaDescriptor hydrateRange = masterRitualStone.getBlockRange(HYDRATE_RANGE);
double steadfastDrain = 0; double steadfastDrain = 0;
if (steadfastWill > steadfastWillDrain) { if (steadfastWill > steadfastWillDrain) {
@ -167,7 +167,7 @@ public class RitualGreenGrove extends Ritual {
double corrosiveDrain = 0; double corrosiveDrain = 0;
if (corrosiveWill > corrosiveWillDrain) { if (corrosiveWill > corrosiveWillDrain) {
AreaDescriptor leechRange = getBlockRange(LEECH_RANGE); AreaDescriptor leechRange = masterRitualStone.getBlockRange(LEECH_RANGE);
AxisAlignedBB mobArea = leechRange.getAABB(pos); AxisAlignedBB mobArea = leechRange.getAABB(pos);
List<EntityLivingBase> entityList = world.getEntitiesWithinAABB(EntityLivingBase.class, mobArea); List<EntityLivingBase> entityList = world.getEntitiesWithinAABB(EntityLivingBase.class, mobArea);
for (EntityLivingBase entityLiving : entityList) { for (EntityLivingBase entityLiving : entityList) {

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualHarvest.java
View file

@ -52,7 +52,7 @@ public class RitualHarvest extends Ritual {
int harvested = 0; int harvested = 0;
AreaDescriptor harvestArea = getBlockRange(HARVEST_RANGE); AreaDescriptor harvestArea = masterRitualStone.getBlockRange(HARVEST_RANGE);
harvestArea.resetIterator(); harvestArea.resetIterator();
while (harvestArea.hasNext()) { while (harvestArea.hasNext()) {

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualInterdiction.java
View file

@ -29,7 +29,7 @@ public class RitualInterdiction extends Ritual {
return; return;
} }
AreaDescriptor interdictionRange = getBlockRange(INTERDICTION_RANGE); AreaDescriptor interdictionRange = masterRitualStone.getBlockRange(INTERDICTION_RANGE);
for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, interdictionRange.getAABB(masterRitualStone.getBlockPos()))) { for (EntityLivingBase entity : world.getEntitiesWithinAABB(EntityLivingBase.class, interdictionRange.getAABB(masterRitualStone.getBlockPos()))) {
if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner()))) if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || ((EntityPlayer) entity).getGameProfile().getId().equals(masterRitualStone.getOwner())))

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

@ -34,7 +34,7 @@ public class RitualJumping extends Ritual {
int maxEffects = currentEssence / getRefreshCost(); int maxEffects = currentEssence / getRefreshCost();
int totalEffects = 0; int totalEffects = 0;
AreaDescriptor jumpRange = getBlockRange(JUMP_RANGE); AreaDescriptor jumpRange = masterRitualStone.getBlockRange(JUMP_RANGE);
List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, jumpRange.getAABB(masterRitualStone.getBlockPos())); List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, jumpRange.getAABB(masterRitualStone.getBlockPos()));
for (EntityLivingBase entity : entities) { for (EntityLivingBase entity : entities) {
if (totalEffects >= maxEffects) { if (totalEffects >= maxEffects) {

10
src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java
View file

@ -76,7 +76,7 @@ public class RitualLava extends Ritual {
double rawDrained = 0; double rawDrained = 0;
DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos);
AreaDescriptor lavaRange = getBlockRange(LAVA_RANGE); AreaDescriptor lavaRange = masterRitualStone.getBlockRange(LAVA_RANGE);
int maxLavaVolume = getMaxVolumeForRange(LAVA_RANGE, willConfig, holder); int maxLavaVolume = getMaxVolumeForRange(LAVA_RANGE, willConfig, holder);
if (!lavaRange.isWithinRange(getMaxVerticalRadiusForRange(LAVA_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(LAVA_RANGE, willConfig, holder)) || (maxLavaVolume != 0 && lavaRange.getVolume() > maxLavaVolume)) { if (!lavaRange.isWithinRange(getMaxVerticalRadiusForRange(LAVA_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(LAVA_RANGE, willConfig, holder)) || (maxLavaVolume != 0 && lavaRange.getVolume() > maxLavaVolume)) {
@ -102,7 +102,7 @@ public class RitualLava extends Ritual {
} }
if (rawWill > 0) { if (rawWill > 0) {
AreaDescriptor chestRange = getBlockRange(LAVA_TANK_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(LAVA_TANK_RANGE);
TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0));
double drain = getWillCostForRawWill(rawWill); double drain = getWillCostForRawWill(rawWill);
int lpCost = getLPCostForRawWill(rawWill); int lpCost = getLPCostForRawWill(rawWill);
@ -131,7 +131,7 @@ public class RitualLava extends Ritual {
if (vengefulWill >= vengefulWillDrain) { if (vengefulWill >= vengefulWillDrain) {
double vengefulDrained = 0; double vengefulDrained = 0;
AreaDescriptor fuseRange = getBlockRange(FIRE_FUSE_RANGE); AreaDescriptor fuseRange = masterRitualStone.getBlockRange(FIRE_FUSE_RANGE);
AxisAlignedBB fuseArea = fuseRange.getAABB(pos); AxisAlignedBB fuseArea = fuseRange.getAABB(pos);
List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, fuseArea); List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, fuseArea);
@ -160,7 +160,7 @@ public class RitualLava extends Ritual {
if (steadfastWill >= steadfastWillDrain) { if (steadfastWill >= steadfastWillDrain) {
double steadfastDrained = 0; double steadfastDrained = 0;
AreaDescriptor resistRange = getBlockRange(FIRE_RESIST_RANGE); AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_RESIST_RANGE);
int duration = getFireResistForWill(steadfastWill); int duration = getFireResistForWill(steadfastWill);
@ -186,7 +186,7 @@ public class RitualLava extends Ritual {
if (timer % corrosiveRefreshTime == 0 && corrosiveWill >= corrosiveWillDrain) { if (timer % corrosiveRefreshTime == 0 && corrosiveWill >= corrosiveWillDrain) {
double corrosiveDrained = 0; double corrosiveDrained = 0;
AreaDescriptor resistRange = getBlockRange(FIRE_DAMAGE_RANGE); AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_DAMAGE_RANGE);
float damage = getCorrosiveDamageForWill(corrosiveWill); float damage = getCorrosiveDamageForWill(corrosiveWill);

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java
View file

@ -49,7 +49,7 @@ public class RitualLivingArmourDowngrade extends Ritual {
BlockPos masterPos = masterRitualStone.getBlockPos(); BlockPos masterPos = masterRitualStone.getBlockPos();
AreaDescriptor downgradeRange = getBlockRange(DOWNGRADE_RANGE); AreaDescriptor downgradeRange = masterRitualStone.getBlockRange(DOWNGRADE_RANGE);
boolean isActivatorPresent = false; boolean isActivatorPresent = false;
for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, downgradeRange.getAABB(masterRitualStone.getBlockPos()))) { for (EntityPlayer player : world.getEntitiesWithinAABB(EntityPlayer.class, downgradeRange.getAABB(masterRitualStone.getBlockPos()))) {

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java
View file

@ -46,7 +46,7 @@ public class RitualMagnetic extends Ritual {
BlockPos pos = masterRitualStone.getBlockPos(); BlockPos pos = masterRitualStone.getBlockPos();
AreaDescriptor placementRange = getBlockRange(PLACEMENT_RANGE); AreaDescriptor placementRange = masterRitualStone.getBlockRange(PLACEMENT_RANGE);
BlockPos replacement = pos; BlockPos replacement = pos;
boolean replace = false; boolean replace = false;

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualMeteor.java
View file

@ -42,7 +42,7 @@ public class RitualMeteor extends Ritual {
double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig);
double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig);
AreaDescriptor itemDetectionRange = getBlockRange(ITEM_RANGE); AreaDescriptor itemDetectionRange = masterRitualStone.getBlockRange(ITEM_RANGE);
List<EntityItem> itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDetectionRange.getAABB(pos)); List<EntityItem> itemList = world.getEntitiesWithinAABB(EntityItem.class, itemDetectionRange.getAABB(pos));
double radiusModifier = getRadiusModifier(rawWill); double radiusModifier = getRadiusModifier(rawWill);

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualPlacer.java
View file

@ -33,7 +33,7 @@ public class RitualPlacer extends Ritual {
public void performRitual(IMasterRitualStone masterRitualStone) { public void performRitual(IMasterRitualStone masterRitualStone) {
World world = masterRitualStone.getWorldObj(); World world = masterRitualStone.getWorldObj();
BlockPos masterPos = masterRitualStone.getBlockPos(); BlockPos masterPos = masterRitualStone.getBlockPos();
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE);
TileEntity tileEntity = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); TileEntity tileEntity = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0));
int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence();
@ -43,7 +43,7 @@ public class RitualPlacer extends Ritual {
return; return;
} }
AreaDescriptor areaDescriptor = getBlockRange(PLACER_RANGE); AreaDescriptor areaDescriptor = masterRitualStone.getBlockRange(PLACER_RANGE);
if (tileEntity != null) { if (tileEntity != null) {
if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) { if (tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) {

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualPump.java
View file

@ -56,7 +56,7 @@ public class RitualPump extends Ritual {
if (fluidHandler.getTankProperties()[0].getContents() != null && fluidHandler.getTankProperties()[0].getContents().amount >= maxDrain) if (fluidHandler.getTankProperties()[0].getContents() != null && fluidHandler.getTankProperties()[0].getContents().amount >= maxDrain)
return; return;
for (BlockPos pos : getBlockRange(PUMP_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { for (BlockPos pos : masterRitualStone.getBlockRange(PUMP_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) {
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
IFluidHandler blockHandler = null; IFluidHandler blockHandler = null;
if (state.getBlock() instanceof BlockLiquid) if (state.getBlock() instanceof BlockLiquid)

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualRegeneration.java
View file

@ -71,10 +71,10 @@ public class RitualRegeneration extends Ritual {
float absorptionRate = 1; float absorptionRate = 1;
int maxAbsorption = 20; int maxAbsorption = 20;
AreaDescriptor healArea = getBlockRange(HEAL_RANGE); AreaDescriptor healArea = masterRitualStone.getBlockRange(HEAL_RANGE);
AxisAlignedBB healRange = healArea.getAABB(pos); AxisAlignedBB healRange = healArea.getAABB(pos);
AreaDescriptor damageArea = getBlockRange(VAMPIRE_RANGE); AreaDescriptor damageArea = masterRitualStone.getBlockRange(VAMPIRE_RANGE);
AxisAlignedBB damageRange = damageArea.getAABB(pos); AxisAlignedBB damageRange = damageArea.getAABB(pos);
List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, healRange); List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, healRange);

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java
View file

@ -50,7 +50,7 @@ public class RitualSpeed extends Ritual {
double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig);
double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig);
AreaDescriptor speedRange = getBlockRange(SPEED_RANGE); AreaDescriptor speedRange = masterRitualStone.getBlockRange(SPEED_RANGE);
double vengefulDrain = 0; double vengefulDrain = 0;
double destructiveDrain = 0; double destructiveDrain = 0;

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualSuppression.java
View file

@ -31,7 +31,7 @@ public class RitualSuppression extends Ritual {
} }
final int refresh = 100; final int refresh = 100;
AreaDescriptor suppressionRange = getBlockRange(SUPPRESSION_RANGE); AreaDescriptor suppressionRange = masterRitualStone.getBlockRange(SUPPRESSION_RANGE);
for (BlockPos blockPos : suppressionRange.getContainedPositions(masterRitualStone.getBlockPos())) { for (BlockPos blockPos : suppressionRange.getContainedPositions(masterRitualStone.getBlockPos())) {
IBlockState state = world.getBlockState(blockPos); IBlockState state = world.getBlockState(blockPos);

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualUpgradeRemove.java
View file

@ -40,7 +40,7 @@ public class RitualUpgradeRemove extends Ritual {
BlockPos pos = masterRitualStone.getBlockPos(); BlockPos pos = masterRitualStone.getBlockPos();
AreaDescriptor checkRange = getBlockRange(CHECK_RANGE); AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE);
List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos)); List<EntityPlayer> playerList = world.getEntitiesWithinAABB(EntityPlayer.class, checkRange.getAABB(pos));

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualWater.java
View file

@ -31,7 +31,7 @@ public class RitualWater extends Ritual {
int maxEffects = currentEssence / getRefreshCost(); int maxEffects = currentEssence / getRefreshCost();
int totalEffects = 0; int totalEffects = 0;
AreaDescriptor waterRange = getBlockRange(WATER_RANGE); AreaDescriptor waterRange = masterRitualStone.getBlockRange(WATER_RANGE);
for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getBlockPos())) { for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getBlockPos())) {
if (world.isAirBlock(newPos)) { if (world.isAirBlock(newPos)) {

2
src/main/java/WayofTime/bloodmagic/ritual/types/RitualWellOfSuffering.java
View file

@ -53,7 +53,7 @@ public class RitualWellOfSuffering extends Ritual {
TileEntity tile = world.getTileEntity(altarPos); TileEntity tile = world.getTileEntity(altarPos);
AreaDescriptor altarRange = getBlockRange(ALTAR_RANGE); AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE);
if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof TileAltar)) { if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof TileAltar)) {
for (BlockPos newPos : altarRange.getContainedPositions(pos)) { for (BlockPos newPos : altarRange.getContainedPositions(pos)) {

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualZephyr.java
View file

@ -32,7 +32,7 @@ public class RitualZephyr extends Ritual {
World world = masterRitualStone.getWorldObj(); World world = masterRitualStone.getWorldObj();
int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence();
BlockPos masterPos = masterRitualStone.getBlockPos(); BlockPos masterPos = masterRitualStone.getBlockPos();
AreaDescriptor chestRange = getBlockRange(CHEST_RANGE); AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE);
TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0));
if (!masterRitualStone.getWorldObj().isRemote && tileInventory != null) { if (!masterRitualStone.getWorldObj().isRemote && tileInventory != null) {
if (currentEssence < getRefreshCost()) { if (currentEssence < getRefreshCost()) {
@ -40,7 +40,7 @@ public class RitualZephyr extends Ritual {
return; return;
} }
AreaDescriptor zephyrRange = getBlockRange(ZEPHYR_RANGE); AreaDescriptor zephyrRange = masterRitualStone.getBlockRange(ZEPHYR_RANGE);
List<EntityItem> itemList = world.getEntitiesWithinAABB(EntityItem.class, zephyrRange.getAABB(masterRitualStone.getBlockPos())); List<EntityItem> itemList = world.getEntitiesWithinAABB(EntityItem.class, zephyrRange.getAABB(masterRitualStone.getBlockPos()));
int count = 0; int count = 0;

64
src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
View file

@ -2,7 +2,10 @@ package WayofTime.bloodmagic.tile;
import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.Binding;
import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.IBindable;
import WayofTime.bloodmagic.ritual.AreaDescriptor;
import WayofTime.bloodmagic.soul.DemonWillHolder;
import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.util.Constants;
import WayofTime.bloodmagic.event.RitualEvent; import WayofTime.bloodmagic.event.RitualEvent;
import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.IMasterRitualStone;
@ -25,9 +28,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.awt.geom.Area;
import java.util.List; import java.util.*;
import java.util.UUID;
public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone { public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone {
private UUID owner; private UUID owner;
@ -40,6 +42,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
private EnumFacing direction = EnumFacing.NORTH; private EnumFacing direction = EnumFacing.NORTH;
private boolean inverted; private boolean inverted;
private List<EnumDemonWillType> currentActiveWillConfig = new ArrayList<>(); private List<EnumDemonWillType> currentActiveWillConfig = new ArrayList<>();
protected final Map<String, AreaDescriptor> modableRangeMap = new HashMap<>();
@Override @Override
public void onUpdate() { public void onUpdate() {
@ -157,6 +160,9 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
this.cachedNetwork = network; this.cachedNetwork = network;
this.currentRitual = ritual; this.currentRitual = ritual;
if(!checkBlockRanges(ritual.getModableRangeMap()))
addBlockRanges(ritual.getModableRangeMap());
notifyUpdate(); notifyUpdate();
return true; return true;
} }
@ -298,22 +304,14 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
public void setActiveWillConfig(EntityPlayer player, List<EnumDemonWillType> typeList) { public void setActiveWillConfig(EntityPlayer player, List<EnumDemonWillType> typeList) {
this.currentActiveWillConfig = typeList; this.currentActiveWillConfig = typeList;
} }
@Override @Override
public boolean setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2) { public boolean setBlockRangeByBounds(EntityPlayer player, String range, BlockPos offset1, BlockPos offset2) {
if (this.currentRitual != null) { AreaDescriptor descriptor = this.getBlockRange(range);
boolean allowed = this.currentRitual.setBlockRangeByBounds(range, this, offset1, offset2); DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, getBlockPos());
if (player != null && !allowed) { if (this.currentRitual.canBlockRangeBeModified(range, descriptor, this, offset1, offset2, holder)) {
ChatUtil.sendNoSpam(player, this.currentRitual.getErrorForBlockRangeOnFail(player, range, this, offset1, offset2)); descriptor.modifyAreaByBlockPositions(offset1, offset2);
} else { return true;
ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.blockRange.success"));
}
return allowed;
}
if (player != null) {
ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.bloodmagic.blockRange.inactive"));
} }
return false; return false;
@ -408,4 +406,36 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
public void setCurrentActiveWillConfig(List<EnumDemonWillType> currentActiveWillConfig) { public void setCurrentActiveWillConfig(List<EnumDemonWillType> currentActiveWillConfig) {
this.currentActiveWillConfig = currentActiveWillConfig; this.currentActiveWillConfig = currentActiveWillConfig;
} }
/**
* Used to grab the range of a ritual for a given effect.
*
* @param range - Range that needs to be pulled.
* @return -
*/
public AreaDescriptor getBlockRange(String range) {
if (modableRangeMap.containsKey(range)) {
return modableRangeMap.get(range);
}
return null;
}
public void addBlockRange(String range, AreaDescriptor defaultRange) {
modableRangeMap.put(range, defaultRange);
}
public void addBlockRanges(Map<String, AreaDescriptor> blockRanges){
for (Map.Entry<String, AreaDescriptor> entry : blockRanges.entrySet()) {
modableRangeMap.put(entry.getKey(), entry.getValue());
}
}
public boolean checkBlockRanges(Map<String, AreaDescriptor> blockRanges){
for (Map.Entry<String, AreaDescriptor> entry : blockRanges.entrySet()) {
if (modableRangeMap.get(entry.getKey()) == null)
return false;
}
return true;
}
} }