From 8259676d1b59f8068dd9f20c72041c1b91d61310 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 13 Feb 2017 12:57:41 -0800 Subject: [PATCH] Downgrade tomes are now know that they're downgrades Also Disoriented is localized finally (cherry picked from commit e092161) --- .../bloodmagic/item/ItemUpgradeTome.java | 12 ++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 19 ++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index 62439d69..469b521a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -75,6 +75,18 @@ public class ItemUpgradeTome extends Item implements IVariantProvider 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 @SideOnly(Side.CLIENT) public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index c7efae3f..50982019 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -1,6 +1,6 @@ #Creative Tab itemGroup.bloodmagic.creativeTab=Blood Magic -itemGroup.bloodmagic.creativeTabTome=Blood Magic Upgrade Tomes +itemGroup.bloodmagic.creativeTabTome=Blood Magic | Tomes #Items 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.upgradeTome.name=Living Armour Upgrade Tome +item.bloodmagic.downgradeTome.name=Living Armour Downgrade Tome item.bloodmagic.upgradeTrainer.name=Living Armour Training Bracelet item.bloodmagic.sentientSword.name=Sentient Sword @@ -445,7 +446,7 @@ tooltip.bloodmagic.activationCrystal.weak=Activates low-level rituals tooltip.bloodmagic.activationCrystal.awakened=Activates more powerful rituals tooltip.bloodmagic.activationCrystal.creative=Creative Only - Activates any ritual -tooltip.bloodmagic.diviner.currentRitual=Current Ritual: +tooltip.bloodmagic.diviner.currentRitual=Current Ritual: tooltip.bloodmagic.diviner.blankRune=Blank Runes: %d tooltip.bloodmagic.diviner.waterRune=Water Runes: %d tooltip.bloodmagic.diviner.airRune=Air Runes: %d @@ -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.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.amount=Amount tooltip.bloodmagic.fluid.capacity=Capacity -tooltip.bloodmagic.itemFilter.exact=Filters the fluid input/output tooltip.bloodmagic.ghost.everything=Everything tooltip.bloodmagic.ghost.amount=Ghost item amount: %d @@ -699,9 +701,9 @@ ritual.bloodmagic.fullStomachRitual.fillRange.info=(Feeding) The range that the ritual.bloodmagic.fullStomachRitual.chest.info=(Chest) The location of the inventory that the ritual will grab food from to feed players in range. ritual.bloodmagic.interdictionRitual.interdictionRange.info=(Push) The area of the ritual where mobs will be pushed. All mobs are pushed away from the master ritual stone, regardless of where this area is. ritual.bloodmagic.containmentRitual.containmentRange.info=(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is. -ritual.bloodmagic.speedRitual.sanicRange.info=(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual. +ritual.bloodmagic.speedRitual.sanicRange.info=(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual. ritual.bloodmagic.suppressionRitual.suppressionRange.info=(Suppress) All liquids within the range are suppressed. -ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Expulsion) +ritual.bloodmagic.expulsionRitual.expulsionRange.info=(Expulsion) ritual.bloodmagic.zephyrRitual.zephyrRange.info=(Suction) Items within this range will be sucked into the linked chest. ritual.bloodmagic.zephyrRitual.chest.info=(Chest) The location of the inventory that the ritual will place the picked up items into. ritual.bloodmagic.animalGrowthRitual.growing.info=(Growth) Animals within this range will grow much faster. @@ -710,7 +712,7 @@ ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Crystal) Demon Crystals in th ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals. ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. -ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. +ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. ritual.bloodmagic.placerRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. ritual.bloodmagic.fellingRitual.fellingRange.info=(Cutting) The range that the ritual will search out logs and leaves in order to cut down. ritual.bloodmagic.fellingRitual.chest.info=(Chest) The location of the inventory that the ritual will place the results into. @@ -779,11 +781,6 @@ chat.bloodmagic.mimic.potionSpawnRadius.down=Potion spawning radius has been dec entity.bloodmagic.SentientSpecter.name=Sentient Specter 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.error.arg.invalid=Invalid arguments commands.error.arg.missing=Not enough arguments