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

Fully implemented discrete demon will, which means the demon crystals can be inserted into demon crucibles to create will.

Browse source
This commit is contained in:
WayofTime 2016-02-27 16:36:56 -05:00
parent 83c1497609
commit 620023d098
13 changed files with 250 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
View file

@ -11,8 +11,8 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.soul.IDemonWill;
import WayofTime.bloodmagic.api.soul.IDemonWillGem;
import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill;
import WayofTime.bloodmagic.tile.TileDemonCrucible;
import WayofTime.bloodmagic.util.Utils;
@ -74,7 +74,7 @@ public class BlockDemonCrucible extends BlockContainer
if (playerItem != null)
{
if (!(playerItem.getItem() instanceof IDemonWill) && !(playerItem.getItem() instanceof IDemonWillGem))
if (!(playerItem.getItem() instanceof IDiscreteDemonWill) && !(playerItem.getItem() instanceof IDemonWillGem))
{
return false;
}

33
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
View file

@ -13,7 +13,6 @@ import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@ -27,7 +26,7 @@ import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.item.ItemComponent;
import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.item.ItemDemonCrystal;
import WayofTime.bloodmagic.tile.TileDemonCrystal;
public class BlockDemonCrystal extends BlockContainer
@ -165,19 +164,19 @@ public class BlockDemonCrystal extends BlockContainer
switch (type)
{
case CORROSIVE:
stack = ItemComponent.getStack(ItemComponent.CRYSTAL_CORROSIVE);
stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE);
break;
case DEFAULT:
stack = ItemComponent.getStack(ItemComponent.CRYSTAL_DEFAULT);
stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT);
break;
case DESTRUCTIVE:
stack = ItemComponent.getStack(ItemComponent.CRYSTAL_DESTRUCTIVE);
stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE);
break;
case STEADFAST:
stack = ItemComponent.getStack(ItemComponent.CRYSTAL_STEADFAST);
stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST);
break;
case VENGEFUL:
stack = ItemComponent.getStack(ItemComponent.CRYSTAL_VENGEFUL);
stack = ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL);
break;
}
@ -191,26 +190,6 @@ public class BlockDemonCrystal extends BlockContainer
return 0;
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
{
if (world.isRemote)
{
return true;
}
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileDemonCrystal)
{
int crystals = ((TileDemonCrystal) tile).getCrystalCount();
int next = Math.min(7, crystals + 1);
((TileDemonCrystal) tile).setCrystalCount(next);
world.markBlockForUpdate(pos);
}
return true;
}
// @Override
// public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
// {