From 94d3ac83f37aa0b76c3c117207f4af41bb19f97c Mon Sep 17 00:00:00 2001 From: Namikon Date: Wed, 4 Jan 2017 09:21:32 +0100 Subject: [PATCH] Updated to latest BloodMagic build --- .../common/block/BlockLPMaterializer.java | 18 ++++++++------- .../common/block/BlockLifeInfuser.java | 12 +++++----- .../common/block/BlockPortableAltar.java | 22 ++++++++++--------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java index 8cc55ce..1095cb0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.block; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; -import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,8 +17,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; -import java.util.Random; +import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockLPMaterializer extends BlockContainer { @@ -103,7 +105,7 @@ public class BlockLPMaterializer extends BlockContainer } else if (playerItem.getItem().equals(ModItems.sigilOfHolding)) { - ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentItem(playerItem); + ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentSigil(playerItem); if (item != null && item.getItem().equals(ModItems.divinationSigil)) { diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java index a6fc2d4..9f958fb 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java @@ -1,12 +1,10 @@ package com.arc.bloodarsenal.common.block; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; -import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -16,8 +14,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; -import java.util.Random; +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; public class BlockLifeInfuser extends BlockContainer { @@ -60,7 +60,7 @@ public class BlockLifeInfuser extends BlockContainer } else if (playerItem.getItem().equals(ModItems.sigilOfHolding)) { - ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentItem(playerItem); + ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentSigil(playerItem); if (item != null && item.getItem().equals(ModItems.divinationSigil)) { diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java index 570bef1..6465459 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java @@ -1,12 +1,8 @@ package com.arc.bloodarsenal.common.block; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; -import WayofTime.alchemicalWizardry.common.items.EnergyBattery; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; -import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -22,9 +18,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; +import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; -import java.util.ArrayList; -import java.util.Random; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPortableAltar extends BlockContainer { @@ -145,7 +147,7 @@ public class BlockPortableAltar extends BlockContainer } else if (playerItem.getItem().equals(ModItems.sigilOfHolding)) { - ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentItem(playerItem); + ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentSigil(playerItem); if (item != null && item.getItem().equals(ModItems.divinationSigil)) {