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

Fixed the ritual system so that it would properly validate the ritual from the list.

Browse source 
Used the activation crystal's owner's LP to activate the ritual.
Removed some unnecessary imports.
This commit is contained in:
WayofTime 2015-12-29 08:44:34 -05:00
parent 24058d7350
commit 971d4c4d1e
5 changed files with 86 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

@ -1,5 +1,14 @@
package WayofTime.bloodmagic.block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.Constants;
@ -13,16 +22,6 @@ import WayofTime.bloodmagic.registry.ModBlocks;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
import WayofTime.bloodmagic.tile.TileMasterRitualStone;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
public class BlockRitualController extends BlockStringContainer {
@ -58,8 +57,11 @@ public class BlockRitualController extends BlockStringContainer {
if (getMetaFromState(state) == 0 && tile instanceof TileMasterRitualStone) {
if (player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.activationCrystal) {
if (RitualHelper.checkValidRitual(world, pos, "ritualTest", null))
((TileMasterRitualStone) tile).activateRitual(player.getHeldItem(), player, RitualRegistry.getRitualForId("ritualTest"));
String key = RitualHelper.getValidRitual(world, pos, null);
//TODO: Give a message stating that this ritual is not a valid ritual.
if (!key.isEmpty() && RitualHelper.checkValidRitual(world, pos, key, null)) {
((TileMasterRitualStone) tile).activateRitual(player.getHeldItem(), player, RitualRegistry.getRitualForId(key));
}
}
} else if (getMetaFromState(state) == 1 && tile instanceof TileImperfectRitualStone) {