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

Fixed the divination sigil and did a variety of other fixes.

Browse source
This commit is contained in:
WayofTime 2016-03-28 07:25:51 -04:00
parent c2fe583496
commit bd79afd46d
7 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java
View file

@ -24,8 +24,10 @@ public class ItemBindable extends Item implements IBindable
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) {
DinnerBeforeDessert.bindMe(worldIn, playerIn, itemStackIn);
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand)
{
if (!worldIn.isRemote)
DinnerBeforeDessert.bindMe(worldIn, playerIn, itemStackIn);
return super.onItemRightClick(itemStackIn, worldIn, playerIn, hand);
}

6
src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
View file

@ -51,6 +51,12 @@ public class BlockBloodLight extends Block
return false;
}
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override
public boolean isFullCube(IBlockState state)
{

4
src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
View file

@ -2,7 +2,6 @@ package WayofTime.bloodmagic.item;
import java.util.List;
import WayofTime.bloodmagic.api.DinnerBeforeDessert;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
@ -15,6 +14,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.DinnerBeforeDessert;
import WayofTime.bloodmagic.api.iface.IBindable;
import WayofTime.bloodmagic.api.orb.BloodOrb;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
@ -54,7 +54,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
if (world == null)
return super.onItemRightClick(stack, null, player, hand);
super.onItemRightClick(stack, null, player, hand);
super.onItemRightClick(stack, world, player, hand);
DinnerBeforeDessert.setOrbTier(player, stack);
world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.block_fire_extinguish, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);

3
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
View file

@ -34,12 +34,13 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
{
if (!world.isRemote)
{
super.onItemRightClick(stack, world, player, hand);
RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false);
if (position == null)
{
int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence();
System.out.println("Hai~");
List<ITextComponent> toSend = new ArrayList<ITextComponent>();
if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player)))
toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "otherNetwork", getOwnerName(stack))));

1
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java
View file

@ -35,6 +35,7 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader
{
if (!world.isRemote)
{
super.onItemRightClick(stack, world, player, hand);
RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false);
if (position == null)