lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Possible fix for the Magnetism ritual. Also turned Life Essence into a "solid" block for rendering

Browse source
This commit is contained in:
WayofTime 2016-07-02 19:35:08 -04:00
parent dd3c241fd7
commit ffdd72171b
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
View file

@ -5,14 +5,13 @@ import java.awt.Color;
import lombok.Getter; import lombok.Getter;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
@ -35,7 +34,8 @@ public class BlockLifeEssence extends BlockFluidClassic
// TODO - Remove after Forge fixes // TODO - Remove after Forge fixes
// Fix for BlockFluidBase not overriding this // Fix for BlockFluidBase not overriding this
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMeta(int meta)
{
return getBlockState().getBaseState().withProperty(LEVEL, 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); 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 public static class FluidLifeEssence extends Fluid
{ {

2
src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java
View file

@ -141,7 +141,7 @@ public class RitualMagnetic extends Ritual
BlockPos newPos = pos.add(i, j, k); BlockPos newPos = pos.add(i, j, k);
IBlockState state = world.getBlockState(newPos); IBlockState state = world.getBlockState(newPos);
Block block = state.getBlock(); 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); // int meta = block.getMetaFromState(state);
if (isBlockOre(checkStack)) if (isBlockOre(checkStack))