From 5e9454d390f9ce068d1a4c2edca2bcde72b43fbc Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 18 Mar 2016 15:00:23 -0400 Subject: [PATCH] Divination and Seer sigils (362 errors) --- .../item/sigil/ItemSigilDivination.java | 43 +++++++++--------- .../bloodmagic/item/sigil/ItemSigilSeer.java | 45 +++++++++++-------- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index ad281c2c..a543f446 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,5 +1,17 @@ package WayofTime.bloodmagic.item.sigil; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IAltarReader; @@ -8,16 +20,6 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { @@ -28,27 +30,24 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - super.onItemRightClick(stack, world, player); - if (!world.isRemote) { - MovingObjectPosition position = getMovingObjectPositionFromPlayer(world, player, false); + RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false); if (position == null) { int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - List toSend = new ArrayList(); + List toSend = new ArrayList(); if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player))) - toSend.add(new ChatComponentText(TextHelper.localize(tooltipBase + "otherNetwork", getOwnerName(stack)))); - toSend.add(new ChatComponentText(TextHelper.localize(tooltipBase + "currentEssence", currentEssence))); - ChatUtil.sendNoSpam(player, toSend.toArray(new IChatComponent[toSend.size()])); - return stack; + toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "otherNetwork", getOwnerName(stack)))); + toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "currentEssence", currentEssence))); + ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); } else { - if (position.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + if (position.typeOfHit == RayTraceResult.Type.BLOCK) { TileEntity tile = world.getTileEntity(position.getBlockPos()); @@ -71,12 +70,10 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); ChatUtil.sendNoSpam(player, TextHelper.localize(tooltipBase + "currentEssence", currentEssence)); } - - return stack; } } } - return stack; + return super.onItemRightClick(stack, world, player, hand); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index 28c5261d..c9aaded6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -1,19 +1,26 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.tile.TileIncenseAltar; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.helper.TextHelper; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.altar.IBloodAltar; +import WayofTime.bloodmagic.api.iface.IAltarReader; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.tile.TileIncenseAltar; +import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.helper.TextHelper; public class ItemSigilSeer extends ItemSigilBase implements IAltarReader { @@ -24,22 +31,24 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - super.onItemRightClick(stack, world, player); - if (!world.isRemote) { - MovingObjectPosition position = getMovingObjectPositionFromPlayer(world, player, false); + RayTraceResult position = getMovingObjectPositionFromPlayer(world, player, false); if (position == null) { int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); - ChatUtil.sendNoSpam(player, new ChatComponentText(TextHelper.localize(tooltipBase + "currentEssence", currentEssence))); - return stack; + + List toSend = new ArrayList(); + if (!getOwnerName(stack).equals(PlayerHelper.getUsernameFromPlayer(player))) + toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "otherNetwork", getOwnerName(stack)))); + toSend.add(new TextComponentString(TextHelper.localize(tooltipBase + "currentEssence", currentEssence))); + ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); } else { - if (position.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + if (position.typeOfHit == RayTraceResult.Type.BLOCK) { TileEntity tile = world.getTileEntity(position.getBlockPos()); @@ -76,12 +85,10 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader int currentEssence = NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).getCurrentEssence(); ChatUtil.sendNoSpam(player, TextHelper.localize(tooltipBase + "currentEssence", currentEssence)); } - - return stack; } } } - return stack; + return super.onItemRightClick(stack, world, player, hand); } }