Fixed the divination sigil and did a variety of other fixes.
This commit is contained in:
parent
c2fe583496
commit
bd79afd46d
|
@ -24,8 +24,10 @@ public class ItemBindable extends Item implements IBindable
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) {
|
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand)
|
||||||
DinnerBeforeDessert.bindMe(worldIn, playerIn, itemStackIn);
|
{
|
||||||
|
if (!worldIn.isRemote)
|
||||||
|
DinnerBeforeDessert.bindMe(worldIn, playerIn, itemStackIn);
|
||||||
return super.onItemRightClick(itemStackIn, worldIn, playerIn, hand);
|
return super.onItemRightClick(itemStackIn, worldIn, playerIn, hand);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,6 +51,12 @@ public class BlockBloodLight extends Block
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isOpaqueCube(IBlockState state)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isFullCube(IBlockState state)
|
public boolean isFullCube(IBlockState state)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,7 +2,6 @@ package WayofTime.bloodmagic.item;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import WayofTime.bloodmagic.api.DinnerBeforeDessert;
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.init.SoundEvents;
|
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.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import WayofTime.bloodmagic.api.Constants;
|
import WayofTime.bloodmagic.api.Constants;
|
||||||
|
import WayofTime.bloodmagic.api.DinnerBeforeDessert;
|
||||||
import WayofTime.bloodmagic.api.iface.IBindable;
|
import WayofTime.bloodmagic.api.iface.IBindable;
|
||||||
import WayofTime.bloodmagic.api.orb.BloodOrb;
|
import WayofTime.bloodmagic.api.orb.BloodOrb;
|
||||||
import WayofTime.bloodmagic.api.orb.IBloodOrb;
|
import WayofTime.bloodmagic.api.orb.IBloodOrb;
|
||||||
|
@ -54,7 +54,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
|
||||||
if (world == null)
|
if (world == null)
|
||||||
return super.onItemRightClick(stack, null, player, hand);
|
return super.onItemRightClick(stack, null, player, hand);
|
||||||
|
|
||||||
super.onItemRightClick(stack, null, player, hand);
|
super.onItemRightClick(stack, world, player, hand);
|
||||||
DinnerBeforeDessert.setOrbTier(player, stack);
|
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);
|
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);
|
||||||
|
|
|
@ -34,12 +34,13 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
|
||||||
{
|
{
|
||||||
if (!world.isRemote)
|
if (!world.isRemote)
|
||||||
{
|
{
|
||||||
|
super.onItemRightClick(stack, world, player, hand);
|
||||||
RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false);
|
RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false);
|
||||||
|
|
||||||
if (position == null)
|
if (position == null)
|
||||||
{
|
{
|
||||||
int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence();
|
int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence();
|
||||||
|
System.out.println("Hai~");
|
||||||
List<ITextComponent> toSend = new ArrayList<ITextComponent>();
|
List<ITextComponent> toSend = new ArrayList<ITextComponent>();
|
||||||
if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player)))
|
if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player)))
|
||||||
toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "otherNetwork", getOwnerName(stack))));
|
toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "otherNetwork", getOwnerName(stack))));
|
||||||
|
|
|
@ -35,6 +35,7 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader
|
||||||
{
|
{
|
||||||
if (!world.isRemote)
|
if (!world.isRemote)
|
||||||
{
|
{
|
||||||
|
super.onItemRightClick(stack, world, player, hand);
|
||||||
RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false);
|
RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false);
|
||||||
|
|
||||||
if (position == null)
|
if (position == null)
|
||||||
|
|
|
@ -1,15 +1,3 @@
|
||||||
{
|
{
|
||||||
"parent":"builtin/generated",
|
"parent":"item/generated"
|
||||||
"display": {
|
|
||||||
"thirdperson": {
|
|
||||||
"rotation": [ -90, 0, 0 ],
|
|
||||||
"translation": [ 0, 1, -3 ],
|
|
||||||
"scale": [ 0.55, 0.55, 0.55 ]
|
|
||||||
},
|
|
||||||
"firstperson": {
|
|
||||||
"rotation": [ 0, -135, 25 ],
|
|
||||||
"translation": [ 0, 4, 2 ],
|
|
||||||
"scale": [ 1.7, 1.7, 1.7 ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
Binary file not shown.
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.2 KiB |
Loading…
Reference in a new issue