Skip to content

Commit

Permalink
Merge pull request #20 from Tombenpotter/TestProbablyBroken
Browse files Browse the repository at this point in the history
Merge dev branch changes
  • Loading branch information
Nick committed Jan 12, 2015
2 parents 75e478b + 4902430 commit 120837d
Showing 1 changed file with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import WayofTime.alchemicalWizardry.common.Int3;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
Expand Down Expand Up @@ -92,8 +94,7 @@ public void performEffect(IMasterRitualStone ritualStone) {
RitualUtils.placeInInventory(block, world, int3.xCoord, int3.yCoord, int3.zCoord, tileEntity);
}
world.setBlockToAir(int3.xCoord, int3.yCoord, int3.zCoord);
EntityColoredFlameFX particle = new EntityColoredFlameFX(world, int3.xCoord, int3.yCoord, int3.zCoord, 0, 0, 0, 159, 70, 18);
FMLClientHandler.instance().getClient().effectRenderer.addEffect(particle);
addParticles(world, int3);
SoulNetworkHandler.syphonFromNetwork(owner, getCostPerRefresh());
}
}
Expand All @@ -102,6 +103,12 @@ public void performEffect(IMasterRitualStone ritualStone) {
}
}

@SideOnly(Side.CLIENT)
public static void addParticles(World world, Int3 int3) {
EntityColoredFlameFX particle = new EntityColoredFlameFX(world, int3.xCoord, int3.yCoord, int3.zCoord, 0, 0, 0, 159, 70, 18);
FMLClientHandler.instance().getClient().effectRenderer.addEffect(particle);
}

@Override
public int getCostPerRefresh() {
return 30;
Expand Down

0 comments on commit 120837d

Please sign in to comment.