From ca64ecfc660267e89dbc8a35f277de6405a5e13a Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 5 Feb 2016 18:05:44 -0800 Subject: [PATCH] Inform players if they are not using their Divination sigil Should lower the amount of "why isn't my network filling?" questions. --- .../bloodmagic/item/sigil/ItemSigilDivination.java | 11 ++++++++++- src/main/resources/assets/bloodmagic/lang/en_US.lang | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index 305b3ddb..c36bba03 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; 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 WayofTime.bloodmagic.api.Constants; @@ -15,6 +17,9 @@ import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; +import java.util.ArrayList; +import java.util.List; + public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { public ItemSigilDivination() @@ -35,7 +40,11 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader if (position == null) { - ChatUtil.sendNoSpam(player, new ChatComponentText(TextHelper.localize(tooltipBase + "currentEssence", currentEssence))); + 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; } else { diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 2c1aeb01..44bda76b 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -199,6 +199,7 @@ tooltip.BloodMagic.sigil.air.desc=&oI feel lighter already... tooltip.BloodMagic.sigil.bloodLight.desc=&oI see a light! tooltip.BloodMagic.sigil.compression.desc=&oHands of diamonds tooltip.BloodMagic.sigil.divination.desc=&oPeer into the soul +tooltip.BloodMagic.sigil.divination.otherNetwork=Peering into the soul of %s tooltip.BloodMagic.sigil.divination.currentAltarTier=Current Tier: %d tooltip.BloodMagic.sigil.divination.currentEssence=Current Essence: %,d LP tooltip.BloodMagic.sigil.divination.currentAltarCapacity=Current Capacity: %,d LP