From 26d6a8271df4d302a8c485f14aed65aea0e4d7ab Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 25 Jul 2016 23:02:13 -0700 Subject: [PATCH 1/2] Add tooltip to holding sigil displaying keybinding https://redd.it/4umt7s --- .../WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java | 5 +++++ src/main/resources/assets/bloodmagic/lang/en_US.lang | 1 + 2 files changed, 6 insertions(+) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 32f2e983..4e706ee6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -3,6 +3,8 @@ package WayofTime.bloodmagic.item.sigil; import java.util.Collections; import java.util.List; +import WayofTime.bloodmagic.util.handler.event.ClientHandler; +import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,6 +17,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.client.settings.KeyModifier; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -31,6 +34,7 @@ import WayofTime.bloodmagic.util.handler.IKeybindable; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import org.lwjgl.input.Keyboard; public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAltarReader { @@ -73,6 +77,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.holding.press", ClientHandler.keyOpenSigilHolding.getDisplayName())); ItemStack[] inv = getInternalInventory(stack); diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 66c4951d..ca592897 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -294,6 +294,7 @@ tooltip.BloodMagic.sigil.whirlwind.desc=&oBest not to wear a skirt tooltip.BloodMagic.sigil.enderSeverance.desc=&oPutting Endermen in Dire situations! tooltip.BloodMagic.sigil.teleposition.desc=I am very close to being moved by this. tooltip.BloodMagic.sigil.transposition.desc=Feel the power of the Force, my young apprentice. +tooltip.BloodMagic.sigil.holding.press=Press &o%s&r&7 to modify tooltip.BloodMagic.sigil.holding.desc=Sigil-ception tooltip.BloodMagic.sigil.holding.sigilInSlot=Slot %d: %s From 9a39a9f6f032144bc06d3a04182ff25672a81002 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 25 Jul 2016 23:08:24 -0700 Subject: [PATCH 2/2] Cleaner repairable check for Living Armour --- .../java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index cc26a443..1e7095b9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -108,7 +108,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @Override public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) { - return (ModItems.itemComponent == repair.getItem() && repair.getItemDamage() == ItemComponent.getStack(ItemComponent.REAGENT_BINDING).getItemDamage()) ? true : super.getIsRepairable(toRepair, repair); + return ItemStack.areItemsEqual(repair, ItemComponent.getStack(ItemComponent.REAGENT_BINDING)) || super.getIsRepairable(toRepair, repair); } @Override