lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Downgrade tomes are now know that they're downgrades

Browse source 
Also Disoriented is localized finally

(cherry picked from commit e092161)
This commit is contained in:
Nicholas Ignoffo 2017-02-13 12:57:41 -08:00
parent 61bf9c1b08
commit 8259676d1b
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
View file

@ -75,6 +75,18 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
return super.onItemRightClick(world, player, hand); return super.onItemRightClick(world, player, hand);
} }
@Override
public String getUnlocalizedName(ItemStack stack) {
if (!stack.hasTagCompound())
return super.getUnlocalizedName(stack);
LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
if (upgrade != null && upgrade.isDowngrade())
return "item." + Constants.Mod.MODID + ".downgradeTome";
return super.getUnlocalizedName(stack);
}
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList<ItemStack> list) public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList<ItemStack> list)

11
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -1,6 +1,6 @@
#Creative Tab #Creative Tab
itemGroup.bloodmagic.creativeTab=Blood Magic itemGroup.bloodmagic.creativeTab=Blood Magic
itemGroup.bloodmagic.creativeTabTome=Blood Magic Upgrade Tomes itemGroup.bloodmagic.creativeTabTome=Blood Magic | Tomes
#Items #Items
item.bloodmagic.activationCrystal.weak.name=Weak Activation Crystal item.bloodmagic.activationCrystal.weak.name=Weak Activation Crystal
@ -162,6 +162,7 @@ item.bloodmagic.ritualReader.name=Ritual Tinkerer
item.bloodmagic.arcaneAshes.name=Arcane Ashes item.bloodmagic.arcaneAshes.name=Arcane Ashes
item.bloodmagic.upgradeTome.name=Living Armour Upgrade Tome item.bloodmagic.upgradeTome.name=Living Armour Upgrade Tome
item.bloodmagic.downgradeTome.name=Living Armour Downgrade Tome
item.bloodmagic.upgradeTrainer.name=Living Armour Training Bracelet item.bloodmagic.upgradeTrainer.name=Living Armour Training Bracelet
item.bloodmagic.sentientSword.name=Sentient Sword item.bloodmagic.sentientSword.name=Sentient Sword
@ -533,10 +534,11 @@ tooltip.bloodmagic.itemFilter.ignoreNBT=Ignores the NBT of the filter
tooltip.bloodmagic.itemFilter.modItems=Matches all items from the same mod tooltip.bloodmagic.itemFilter.modItems=Matches all items from the same mod
tooltip.bloodmagic.itemFilter.oreDict=Used to filter through the Ore Dictionary tooltip.bloodmagic.itemFilter.oreDict=Used to filter through the Ore Dictionary
tooltip.bloodmagic.itemFilter.exact=Filters the fluid input/output
tooltip.bloodmagic.fluid.type=Fluid Contained tooltip.bloodmagic.fluid.type=Fluid Contained
tooltip.bloodmagic.fluid.amount=Amount tooltip.bloodmagic.fluid.amount=Amount
tooltip.bloodmagic.fluid.capacity=Capacity tooltip.bloodmagic.fluid.capacity=Capacity
tooltip.bloodmagic.itemFilter.exact=Filters the fluid input/output
tooltip.bloodmagic.ghost.everything=Everything tooltip.bloodmagic.ghost.everything=Everything
tooltip.bloodmagic.ghost.amount=Ghost item amount: %d tooltip.bloodmagic.ghost.amount=Ghost item amount: %d
@ -779,11 +781,6 @@ chat.bloodmagic.mimic.potionSpawnRadius.down=Potion spawning radius has been dec
entity.bloodmagic.SentientSpecter.name=Sentient Specter entity.bloodmagic.SentientSpecter.name=Sentient Specter
entity.bloodmagic.Mimic.name=Mimic entity.bloodmagic.Mimic.name=Mimic
# sekrit
secret.bloodmagic.bread.bloody=&r&cBloody Bread
secret.bloodmagic.bread.bloody.desc=Only for &odire &r&7emergencies.
# Commands # Commands
commands.error.arg.invalid=Invalid arguments commands.error.arg.invalid=Invalid arguments
commands.error.arg.missing=Not enough arguments commands.error.arg.missing=Not enough arguments