Fixed #541

Fixed #542

src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java

@@ -67,6 +67,12 @@ public class RitualRegistry
     {
         try
         {
+            //TODO: Fix the Enabled Rituals map so that the config loads properly.
+            if (!enabledRituals.containsKey(ritual))
+            {
+                return true;
+            }
+
             return enabledRituals.get(ritual);
         } catch (NullPointerException e)
         {

src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java

@@ -33,7 +33,7 @@ public interface IMasterRitualStone
 
     int getRunningTime();
 
-    World getWorld();
+    World getWorldObj();
 
-    BlockPos getPos();
+    BlockPos getBlockPos();
 }

src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java

@@ -19,6 +19,7 @@ import WayofTime.bloodmagic.block.base.BlockStringContainer;
 import WayofTime.bloodmagic.registry.ModItems;
 import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
+import WayofTime.bloodmagic.util.ChatUtil;
 
 public class BlockRitualController extends BlockStringContainer
 {
@@ -55,6 +56,9 @@ public class BlockRitualController extends BlockStringContainer
                     {
                         ((TileMasterRitualStone) tile).setDirection(direction);
                     }
+                } else
+                {
+                    ChatUtil.sendNoSpamUnloc(player, "chat.BloodMagic.ritual.notValid");
                 }
             }
         } else if (getMetaFromState(state) == 1 && tile instanceof TileImperfectRitualStone)

src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java

@@ -38,7 +38,7 @@ public class RitualFeatheredKnife extends Ritual
     @Override
     public void performRitual(IMasterRitualStone masterRitualStone)
     {
-        World world = masterRitualStone.getWorld();
+        World world = masterRitualStone.getWorldObj();
         SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner());
         int currentEssence = network.getCurrentEssence();
 
@@ -48,7 +48,7 @@ public class RitualFeatheredKnife extends Ritual
             return;
         }
 
-        BlockPos pos = masterRitualStone.getPos();
+        BlockPos pos = masterRitualStone.getBlockPos();
 
         int maxEffects = currentEssence / getRefreshCost();
         int totalEffects = 0;

src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java

@@ -31,7 +31,7 @@ public class RitualGreenGrove extends Ritual
     @Override
     public void performRitual(IMasterRitualStone masterRitualStone)
     {
-        World world = masterRitualStone.getWorld();
+        World world = masterRitualStone.getWorldObj();
         SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner());
         int currentEssence = network.getCurrentEssence();
 
@@ -46,7 +46,7 @@ public class RitualGreenGrove extends Ritual
 
         AreaDescriptor growingRange = getBlockRange(GROW_RANGE);
 
-        for (BlockPos newPos : growingRange.getContainedPositions(masterRitualStone.getPos()))
+        for (BlockPos newPos : growingRange.getContainedPositions(masterRitualStone.getBlockPos()))
         {
             IBlockState state = world.getBlockState(newPos);
             Block block = state.getBlock();

src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java

@@ -30,7 +30,7 @@ public class RitualJumping extends Ritual
     @Override
     public void performRitual(IMasterRitualStone masterRitualStone)
     {
-        World world = masterRitualStone.getWorld();
+        World world = masterRitualStone.getWorldObj();
         SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner());
         int currentEssence = network.getCurrentEssence();
 
@@ -44,7 +44,7 @@ public class RitualJumping extends Ritual
         int totalEffects = 0;
 
         AreaDescriptor jumpRange = getBlockRange(JUMP_RANGE);
-        List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, jumpRange.getAABB(masterRitualStone.getPos()));
+        List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, jumpRange.getAABB(masterRitualStone.getBlockPos()));
         if (entities != null)
         {
             for (EntityLivingBase entity : entities)

src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java

@@ -23,7 +23,7 @@ public class RitualLava extends Ritual
     @Override
     public void performRitual(IMasterRitualStone masterRitualStone)
     {
-        World world = masterRitualStone.getWorld();
+        World world = masterRitualStone.getWorldObj();
         SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner());
         int currentEssence = network.getCurrentEssence();
 
@@ -38,7 +38,7 @@ public class RitualLava extends Ritual
 
         AreaDescriptor lavaRange = getBlockRange(LAVA_RANGE);
 
-        for (BlockPos newPos : lavaRange.getContainedPositions(masterRitualStone.getPos()))
+        for (BlockPos newPos : lavaRange.getContainedPositions(masterRitualStone.getBlockPos()))
         {
             if (world.isAirBlock(newPos))
             {

src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java

@@ -34,7 +34,7 @@ public class RitualRegeneration extends Ritual
     @Override
     public void performRitual(IMasterRitualStone masterRitualStone)
     {
-        World world = masterRitualStone.getWorld();
+        World world = masterRitualStone.getWorldObj();
         SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner());
         int currentEssence = network.getCurrentEssence();
 
@@ -44,7 +44,7 @@ public class RitualRegeneration extends Ritual
             return;
         }
 
-        BlockPos pos = masterRitualStone.getPos();
+        BlockPos pos = masterRitualStone.getBlockPos();
 
         int maxEffects = currentEssence / getRefreshCost();
         int totalEffects = 0;

src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java

@@ -23,7 +23,7 @@ public class RitualWater extends Ritual
     @Override
     public void performRitual(IMasterRitualStone masterRitualStone)
     {
-        World world = masterRitualStone.getWorld();
+        World world = masterRitualStone.getWorldObj();
         SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner());
         int currentEssence = network.getCurrentEssence();
 
@@ -38,7 +38,7 @@ public class RitualWater extends Ritual
 
         AreaDescriptor waterRange = getBlockRange(WATER_RANGE);
 
-        for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getPos()))
+        for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getBlockPos()))
         {
             if (world.isAirBlock(newPos))
             {

src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java

@@ -39,7 +39,7 @@ public class RitualWellOfSuffering extends Ritual
     @Override
     public void performRitual(IMasterRitualStone masterRitualStone)
     {
-        World world = masterRitualStone.getWorld();
+        World world = masterRitualStone.getWorldObj();
         SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner());
         int currentEssence = network.getCurrentEssence();
 
@@ -49,7 +49,7 @@ public class RitualWellOfSuffering extends Ritual
             return;
         }
 
-        BlockPos pos = masterRitualStone.getPos();
+        BlockPos pos = masterRitualStone.getBlockPos();
 
         int maxEffects = currentEssence / getRefreshCost();
         int totalEffects = 0;

src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java

@@ -88,6 +88,8 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
         activationCrystal = NBTHelper.checkNBT(activationCrystal);
         String crystalOwner = activationCrystal.getTagCompound().getString(Constants.NBT.OWNER_UUID);
 
+        System.out.println("Test");
+
         if (!Strings.isNullOrEmpty(crystalOwner) && ritual != null)
         {
             if (activationCrystal.getItem() instanceof ItemActivationCrystal)
@@ -239,4 +241,16 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
         super.onDataPacket(net, packet);
         readFromNBT(packet.getNbtCompound());
     }
+
+    @Override
+    public World getWorldObj()
+    {
+        return getWorld();
+    }
+
+    @Override
+    public BlockPos getBlockPos()
+    {
+        return getPos();
+    }
 }