diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 2f5b01ec..4897b454 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -5,14 +5,13 @@ import java.awt.Color; import lombok.Getter; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; @@ -35,7 +34,8 @@ public class BlockLifeEssence extends BlockFluidClassic // TODO - Remove after Forge fixes // Fix for BlockFluidBase not overriding this @Override - public IBlockState getStateFromMeta(int meta) { + public IBlockState getStateFromMeta(int meta) + { return getBlockState().getBaseState().withProperty(LEVEL, meta); } @@ -51,6 +51,12 @@ public class BlockLifeEssence extends BlockFluidClassic return !world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isLiquid() && super.displaceIfPossible(world, blockPos); } + @Override + public BlockRenderLayer getBlockLayer() + { + return BlockRenderLayer.SOLID; + } + public static class FluidLifeEssence extends Fluid { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 3f3f9e6a..860d7776 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -141,7 +141,7 @@ public class RitualMagnetic extends Ritual BlockPos newPos = pos.add(i, j, k); IBlockState state = world.getBlockState(newPos); Block block = state.getBlock(); - ItemStack checkStack = block.getPickBlock(state, null, world, pos, null); + ItemStack checkStack = block.getPickBlock(state, null, world, newPos, null); // int meta = block.getMetaFromState(state); if (isBlockOre(checkStack))