From 6c6d8067bfa0963e82822efdd875453b2ec9ef68 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Tue, 29 Dec 2015 14:22:33 -0500
Subject: [PATCH] Fixed the rituals. Thanks, AlgorithmX2!

---
 .../block/BlockRitualController.java           | 18 +-----------------
 .../bloodmagic/tile/TileMasterRitualStone.java | 15 ++++-----------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
index ae4d7765..a3b29276 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
@@ -5,7 +5,6 @@ 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;
@@ -15,10 +14,8 @@ import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry;
 import WayofTime.bloodmagic.api.registry.RitualRegistry;
 import WayofTime.bloodmagic.api.ritual.Ritual;
-import WayofTime.bloodmagic.api.ritual.RitualComponent;
 import WayofTime.bloodmagic.api.util.helper.RitualHelper;
 import WayofTime.bloodmagic.block.base.BlockStringContainer;
-import WayofTime.bloodmagic.registry.ModBlocks;
 import WayofTime.bloodmagic.registry.ModItems;
 import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
@@ -42,19 +39,6 @@ public class BlockRitualController extends BlockStringContainer {
     public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) {
         TileEntity tile = world.getTileEntity(pos);
 
-        if (player.getHeldItem() == null && tile instanceof TileMasterRitualStone) {
-            Ritual send = ((TileMasterRitualStone) tile).getCurrentRitual();
-            if (send != null)
-                player.addChatComponentMessage(new ChatComponentText(send.getName()));
-            else {
-                Ritual place = RitualRegistry.getRitualForId("ritualTest");
-                for (RitualComponent ritualComponent : place.getComponents()) {
-                    IBlockState toPlace = ModBlocks.ritualStone.getStateFromMeta(ritualComponent.getRuneType().ordinal());
-                    world.setBlockState(pos.add(ritualComponent.getOffset()), toPlace);
-                }
-            }
-        }
-
         if (getMetaFromState(state) == 0 && tile instanceof TileMasterRitualStone) {
             if (player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.activationCrystal) {
             	String key = RitualHelper.getValidRitual(world, pos);
@@ -96,6 +80,6 @@ public class BlockRitualController extends BlockStringContainer {
 
     @Override
     public TileEntity createNewTileEntity(World world, int meta) {
-        return meta == 0 ? new TileMasterRitualStone() : new TileImperfectRitualStone();
+        return meta == 0 ? (new TileMasterRitualStone()) : (new TileImperfectRitualStone());
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
index f2e04f97..3859c931 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
@@ -42,16 +42,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
     private EnumFacing direction = EnumFacing.NORTH;
 
     @Override
-    public void update() {
-    	if(!worldObj.isRemote && worldObj.getWorldTime() % REFRESH_TIME == 0) {
-    		System.out.println("Owner: " + owner);
-    		if(isActive()) {
-        		System.out.println("Is active");
-        	}
-    		
-    		System.out.println("Active time: " + activeTime);
-    	}
-    	
+    public void update() {   	
         if (getCurrentRitual() != null && isActive()) {
             if (activeTime % REFRESH_TIME == 0)
                 performRitual(getWorld(), getPos());
@@ -62,15 +53,17 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
 
     @Override
     public void readFromNBT(NBTTagCompound tag) {
+    	super.readFromNBT(tag);
         owner = tag.getString(Constants.NBT.OWNER_UUID);
         currentRitual = RitualRegistry.getRitualForId(tag.getString(Constants.NBT.CURRENT_RITUAL));
         active = tag.getBoolean(Constants.NBT.IS_RUNNING);
         activeTime = tag.getInteger(Constants.NBT.RUNTIME);
-        direction = EnumFacing.VALUES[tag.getInteger(Constants.NBT.DIRECTION)];  
+        direction = EnumFacing.VALUES[tag.getInteger(Constants.NBT.DIRECTION)];
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag) {
+    	super.writeToNBT(tag);
         String ritualId = RitualRegistry.getIdForRitual(getCurrentRitual());
         tag.setString(Constants.NBT.OWNER_UUID, Strings.isNullOrEmpty(getOwner()) ? "" : getOwner());
         tag.setString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId);