From bd79afd46d9f526de0c172678c17052c6e6ce202 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 28 Mar 2016 07:25:51 -0400 Subject: [PATCH] Fixed the divination sigil and did a variety of other fixes. --- .../bloodmagic/api/impl/ItemBindable.java | 6 ++++-- .../bloodmagic/block/BlockBloodLight.java | 6 ++++++ .../bloodmagic/item/ItemBloodOrb.java | 4 ++-- .../item/sigil/ItemSigilDivination.java | 3 ++- .../bloodmagic/item/sigil/ItemSigilSeer.java | 1 + .../bloodmagic/models/item/ItemModelBase.json | 14 +------------- .../textures/items/WeakBloodOrb.png | Bin 2055 -> 1220 bytes 7 files changed, 16 insertions(+), 18 deletions(-) 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 b9dc856a84065368319b9ba7b28b8f6f7362563e..0e71c209c480d3442e8cfb17691d29569307a1bb 100644 GIT binary patch delta 1200 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