diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java index a8dbcd66..1e60e8c7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java @@ -24,8 +24,10 @@ public class ItemBindable extends Item implements IBindable } @Override - public ActionResult onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) { - DinnerBeforeDessert.bindMe(worldIn, playerIn, itemStackIn); + public ActionResult onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) + { + if (!worldIn.isRemote) + DinnerBeforeDessert.bindMe(worldIn, playerIn, itemStackIn); return super.onItemRightClick(itemStackIn, worldIn, playerIn, hand); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index c7944161..97042bc6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -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) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 327765e9..6af4f457 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index a543f446..c1c2165e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -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 toSend = new ArrayList(); if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player))) toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "otherNetwork", getOwnerName(stack)))); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index c9aaded6..9cf8e7ff 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -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) diff --git a/src/main/resources/assets/bloodmagic/models/item/ItemModelBase.json b/src/main/resources/assets/bloodmagic/models/item/ItemModelBase.json index 28b35fce..a5461048 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ItemModelBase.json +++ b/src/main/resources/assets/bloodmagic/models/item/ItemModelBase.json @@ -1,15 +1,3 @@ { - "parent":"builtin/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 ] - } - } + "parent":"item/generated" } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/textures/items/WeakBloodOrb.png b/src/main/resources/assets/bloodmagic/textures/items/WeakBloodOrb.png index b9dc856a..0e71c209 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/WeakBloodOrb.png and b/src/main/resources/assets/bloodmagic/textures/items/WeakBloodOrb.png differ