fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add descriptions to some wizardry items in JEI

Browse Source 
Covers most of the items players might stumble across
This commit is contained in:
Electroblob77
2020-04-17 21:49:01 +01:00
parent cdc326e36c
commit 618df1c668
5 changed files with 138 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/integration/jei/WizardryJEIPlugin.java
+77
View File
@@ -3,17 +3,27 @@ package electroblob.wizardry.integration.jei;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.enchantment.Imbuement;
import electroblob.wizardry.item.IConjuredItem;
import electroblob.wizardry.item.ItemArcaneTome;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.ItemWandUpgrade;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryEnchantments;
import electroblob.wizardry.registry.WizardryItems;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.ISubtypeRegistry;
import mezz.jei.api.JEIPlugin;
import mezz.jei.api.ingredients.IIngredientBlacklist;
import mezz.jei.api.ingredients.VanillaTypes;
import mezz.jei.api.recipe.IRecipeCategoryRegistration;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentData;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import java.util.Arrays;
import java.util.Locale;
@JEIPlugin
public class WizardryJEIPlugin implements IModPlugin {
@@ -53,6 +63,41 @@ public class WizardryJEIPlugin implements IModPlugin {
}
}
addItemInfo(registry, WizardryItems.magic_crystal);
addItemInfo(registry, WizardryItems.wizard_handbook);
addItemInfo(registry, WizardryItems.crystal_shard);
addItemInfo(registry, WizardryItems.grand_crystal);
addItemInfo(registry, WizardryItems.identification_scroll);
addItemInfo(registry, WizardryItems.spell_book);
addItemInfo(registry, WizardryItems.scroll);
addItemInfo(registry, WizardryItems.armour_upgrade, ".desc_extended");
addItemInfo(registry, WizardryItems.purifying_elixir, ".desc_extended");
addItemInfo(registry, WizardryItems.astral_diamond);
for(Item item : Item.REGISTRY){
if(item instanceof ItemArtefact){
ItemStack stack = new ItemStack(item);
registry.addIngredientInfo(stack, VanillaTypes.ITEM, "item." + Wizardry.MODID + ":"
+ ((ItemArtefact)item).getType().toString().toLowerCase(Locale.ROOT) + ".generic.desc");
}else if(item instanceof ItemWandUpgrade || item instanceof ItemArcaneTome){
NonNullList<ItemStack> subItems = NonNullList.create();
item.getSubItems(item.getCreativeTab(), subItems);
for(ItemStack stack : subItems){
registry.addIngredientInfo(stack, VanillaTypes.ITEM, "item." + Wizardry.MODID +
":wand_upgrade.generic.desc");
}
}
}
addEnchantmentInfo(registry, WizardryEnchantments.magic_protection);
addEnchantmentInfo(registry, WizardryEnchantments.frost_protection);
addEnchantmentInfo(registry, WizardryEnchantments.shock_protection);
}
@Override
@@ -65,4 +110,36 @@ public class WizardryJEIPlugin implements IModPlugin {
}
private static void addItemInfo(IModRegistry registry, Item item){
addItemInfo(registry, item, ".desc");
}
private static void addItemInfo(IModRegistry registry, Item item, String... suffixes){
NonNullList<ItemStack> subItems = NonNullList.create();
item.getSubItems(item.getCreativeTab(), subItems);
for(ItemStack stack : subItems) addItemInfo(registry, stack, suffixes);
}
private static void addItemInfo(IModRegistry registry, ItemStack stack, String... suffixes){
String prefix = stack.getItem().getTranslationKey(stack);
String[] keys = Arrays.stream(suffixes).map(s -> prefix + s).toArray(String[]::new);
registry.addIngredientInfo(stack, VanillaTypes.ITEM, keys);
}
private static void addEnchantmentInfo(IModRegistry registry, Enchantment enchantment){
addEnchantmentInfo(registry, enchantment, ".desc");
}
private static void addEnchantmentInfo(IModRegistry registry, Enchantment enchantment, String... suffixes){
for(int level = enchantment.getMinLevel(); level <= enchantment.getMaxLevel(); level++){
addEnchantmentInfo(registry, new EnchantmentData(enchantment, level), suffixes);
}
}
private static void addEnchantmentInfo(IModRegistry registry, EnchantmentData data, String... suffixes){
String prefix = data.enchantment.getName().replace(":", "."); // Compat with WAWLA descriptions
String[] keys = Arrays.stream(suffixes).map(s -> prefix + s).toArray(String[]::new);
registry.addIngredientInfo(data, VanillaTypes.ENCHANT, keys);
}
}
src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java
+1 -3
View File
@@ -34,9 +34,7 @@ public class ItemArmourUpgrade extends Item {
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, net.minecraft.client.util.ITooltipFlag flagIn) {
tooltip.add(net.minecraft.client.resources.I18n.format("item." + Wizardry.MODID + ":armour_upgrade.desc1", "\u00A77"));
tooltip.add(
net.minecraft.client.resources.I18n.format("item." + Wizardry.MODID + ":armour_upgrade.desc2", "\u00A77", "\u00A7d"));
Wizardry.proxy.addMultiLineDescription(tooltip, "item." + this.getRegistryName() + ".desc", "\u00A7d");
}
}
src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java
+1 -2
View File
@@ -27,8 +27,7 @@ public class ItemWizardHandbook extends Item {
@Override
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, net.minecraft.client.util.ITooltipFlag flag) {
tooltip.add(
"\u00A77" + net.minecraft.client.resources.I18n.format("item." + Wizardry.MODID + ":wizard_handbook.desc", AUTHOR));
tooltip.add("\u00A77" + net.minecraft.client.resources.I18n.format("item." + Wizardry.MODID + ":wizard_handbook.author", AUTHOR));
}
@Override
src/main/resources/assets/ebwizardry/lang/en_gb.lang
+30 -6
View File
@@ -48,19 +48,24 @@ tile.ebwizardry\:acacia_lectern.name=Acacia Lectern
tile.ebwizardry\:dark_oak_lectern.name=Dark Oak Lectern
item.ebwizardry\:crystal_magic.name=Magic Crystal
item.ebwizardry\:crystal_magic.desc=The iridescent colours of this crystal seem to slowly shift and swirl, hinting at a magical energy within. Perhaps this magic could be harnessed in some way?
item.ebwizardry\:crystal_fire.name=Fiery Crystal
item.ebwizardry\:crystal_fire.desc=A crystal that glows a fiery orange. Maybe it is the key to unlocking the element of fire...
item.ebwizardry\:crystal_ice.name=Icy Crystal
item.ebwizardry\:crystal_ice.desc=A crystal with a cold, bluish tint. Perhaps it holds the secrets to the power of frost...
item.ebwizardry\:crystal_lightning.name=Stormy Crystal
item.ebwizardry\:crystal_lightning.desc=A crystal that seems to swirl and flash with a chaotic energy. Maybe it hides a greater power within...
item.ebwizardry\:crystal_necromancy.name=Dark Crystal
item.ebwizardry\:crystal_necromancy.desc=A crystal with a deep, purplish appearance that seems to draw you in. Perhaps it is a gateway to something darker...
item.ebwizardry\:crystal_earth.name=Verdant Crystal
item.ebwizardry\:crystal_earth.desc=A crystal patterened with a great many greens and browns. Perhaps it holds a connection to the forces of nature...
item.ebwizardry\:crystal_sorcery.name=Mystical Crystal
item.ebwizardry\:crystal_sorcery.desc=A crystal that glimmers with a bluish-green light. Maybe it conceals the secrets of an ancient force...
item.ebwizardry\:crystal_healing.name=Radiant Crystal
item.ebwizardry\:crystal_healing.desc=A crystal that glints a golden yellow in the sunlight. Perhaps it possesses the link to a divine power...
item.ebwizardry\:magic_wand.name=Magic Wand
item.ebwizardry\:apprentice_wand.name=Apprentice Wand
item.ebwizardry\:advanced_wand.name=Advanced Wand
item.ebwizardry\:master_wand.name=Master Wand
item.ebwizardry\:spell_book.name=Spell Book
item.ebwizardry\:spell_book.desc=A book filled with the runes and glyphs of an ancient script. Perhaps with dedication, one might be able to decipher its contents...\n\nRight-click while holding this book to read it.
item.ebwizardry\:spell_book.apply_to_wizard=Replaced %1$s's spell %2$s with %3$s
@@ -68,6 +73,7 @@ item.ebwizardry\:arcane_tome.name=Tome of Arcana
item.ebwizardry\:arcane_tome.desc=Upgrades any %1$s wand with sufficient progression to %2$s tier
item.ebwizardry\:wizard_handbook.name=The Wizard's Handbook
item.ebwizardry\:wizard_handbook.author=by %1$s
item.ebwizardry\:wizard_handbook.desc=by %1$s
item.ebwizardry\:wand.generic=wand
@@ -82,6 +88,11 @@ item.ebwizardry\:wand.levelup=%1$s is ready to upgrade to %2$s tier
item.ebwizardry\:wand.addally=%1$s has been added to your list of allies
item.ebwizardry\:wand.removeally=%1$s has been removed from your list of allies
item.ebwizardry\:magic_wand.name=Magic Wand
item.ebwizardry\:apprentice_wand.name=Apprentice Wand
item.ebwizardry\:advanced_wand.name=Advanced Wand
item.ebwizardry\:master_wand.name=Master Wand
item.ebwizardry\:novice_fire_wand.name=Wand of Embers
item.ebwizardry\:novice_ice_wand.name=Wand of Frost
item.ebwizardry\:novice_lightning_wand.name=Wand of Sparks
@@ -126,12 +137,16 @@ item.ebwizardry\:medium_mana_flask.name=Medium Mana Flask
item.ebwizardry\:large_mana_flask.name=Large Mana Flask
item.ebwizardry\:grand_crystal.name=Grand Magic Crystal
item.ebwizardry\:grand_crystal.desc=A huge magic crystal, several times the size of those found naturally. Someone must have grown it artificially - but how?
item.ebwizardry\:crystal_shard.name=Magic Crystal Shard
item.ebwizardry\:crystal_shard.desc=A small piece of a shattered magic crystal. It contains little mana on its own, but it might have other uses...
item.ebwizardry\:astral_diamond.name=Astral Diamond
item.ebwizardry\:astral_diamond.desc=A highly-prized gemstone that sparkles brightly under starlight. It is said that the most powerful wizards seek astral diamonds in return for the most elusive arcane knowledge.
item.ebwizardry\:purifying_elixir.name=Purifying Elixir
item.ebwizardry\:purifying_elixir.desc=Removes curses when consumed
item.ebwizardry\:purifying_elixir.desc_extended=A small vial of exotic-looking golden liquid, which clearly has powerful healing properties. It would probably be wise to save this for when it is needed.
item.ebwizardry\:storage_upgrade.name=Wand Storage Upgrade
item.ebwizardry\:siphon_upgrade.name=Wand Siphon Upgrade
@@ -143,6 +158,8 @@ item.ebwizardry\:blast_upgrade.name=Wand Blast Upgrade
item.ebwizardry\:attunement_upgrade.name=Wand Attunement Upgrade
item.ebwizardry\:melee_upgrade.name=Wand Melee Upgrade
item.ebwizardry\:wand_upgrade.generic.desc=Apply this upgrade to a wand in the arcane workbench.
item.ebwizardry\:storage_upgrade.desc=Upgrades the mana capacity of a wand
item.ebwizardry\:siphon_upgrade.desc=Upgrades a wand to extract mana from mobs when killed
item.ebwizardry\:condenser_upgrade.desc=Upgrades a wand to slowly regenerate mana over time
@@ -168,13 +185,14 @@ item.ebwizardry\:blank_scroll.name=Blank Scroll
item.ebwizardry\:scroll.generic=scroll
item.ebwizardry\:scroll.name=Scroll of %1$s
item.ebwizardry\:scroll.undiscovered.name=Scroll "%1$s"
item.ebwizardry\:scroll.desc=An enchanted sheet of parchment bound loosely with string. Upon the parchment is written an incantation of some kind, presumably to be read aloud.\n\nRight-click while holding this scroll to use it.
item.ebwizardry\:identification_scroll.name=Scroll of Identification
item.ebwizardry\:identification_scroll.desc=Identifies an unknown spell book or scroll
item.ebwizardry\:identification_scroll.nothing_to_identify=Nothing to identify!
item.ebwizardry\:armour_upgrade.name=Arcane Seal of Protection
item.ebwizardry\:armour_upgrade.desc1=%1$sUpgrades any wizard armour
item.ebwizardry\:armour_upgrade.desc2=%1$sto make it %2$slegendary
item.ebwizardry\:armour_upgrade.desc=Upgrades any wizard armour to make it %1$slegendary
item.ebwizardry\:armour_upgrade.desc_extended=Apply this upgrade to a piece of wizard armour in the arcane workbench.
item.ebwizardry\:magic_silk.name=Magical Silk
@@ -232,6 +250,10 @@ item.ebwizardry\:spectral_boots.name=Spectral Boots
item.ebwizardry\:lightning_hammer.name=Lightning Hammer
item.ebwizardry\:ring.generic.desc=Equip this ring in the Baubles inventory or by placing it on your hotbar. Up to 2 rings may be equipped at once.
item.ebwizardry\:amulet.generic.desc=Equip this amulet in the Baubles inventory or by placing it on your hotbar. Only one amulet may be equipped at a time.
item.ebwizardry\:charm.generic.desc=Equip this charm in the Baubles inventory or by placing it on your hotbar. Only one charm may be equipped at a time.
item.ebwizardry\:ring_condensing.name=Ring of Condensing
item.ebwizardry\:ring_condensing.desc=Slowly regenerates mana for all wands on your hotbar
item.ebwizardry\:ring_siphoning.name=Ring of Siphoning
@@ -1350,3 +1372,5 @@ spell.ebwizardry\:invigorating_presence_festive=Invigorating Presents
spell.ebwizardry\:empowering_presence_festive=Empowering Presents
wizard.debug=%1$s, %2$s, %3$s
item.ebwizardry\:armour_upgrade.desc1=%1$sUpgrades any wizard armour
item.ebwizardry\:armour_upgrade.desc2=%1$sto make it %2$slegendary
src/main/resources/assets/ebwizardry/lang/en_us.lang
+29 -7
View File
@@ -48,19 +48,24 @@ tile.ebwizardry\:acacia_lectern.name=Acacia Lectern
tile.ebwizardry\:dark_oak_lectern.name=Dark Oak Lectern
item.ebwizardry\:crystal_magic.name=Magic Crystal
item.ebwizardry\:crystal_magic.desc=The iridescent colors of this crystal seem to slowly shift and swirl, hinting at a magical energy within. Perhaps this magic could be harnessed, somehow...
item.ebwizardry\:crystal_fire.name=Fiery Crystal
item.ebwizardry\:crystal_fire.desc=A crystal that glows a fiery orange. Maybe it is the key to unlocking the element of fire...
item.ebwizardry\:crystal_ice.name=Icy Crystal
item.ebwizardry\:crystal_ice.desc=A crystal with a cold, bluish tint. Perhaps it holds the secrets to the power of frost...
item.ebwizardry\:crystal_lightning.name=Stormy Crystal
item.ebwizardry\:crystal_lightning.desc=A crystal that seems to swirl and flash with a chaotic energy. Maybe it hides a greater power within...
item.ebwizardry\:crystal_necromancy.name=Dark Crystal
item.ebwizardry\:crystal_necromancy.desc=A crystal with a deep, purplish appearance that seems to draw you in. Perhaps it is a gateway to something darker...
item.ebwizardry\:crystal_earth.name=Verdant Crystal
item.ebwizardry\:crystal_earth.desc=A crystal patterened with a great many greens and browns. Perhaps it holds a connection to the forces of nature...
item.ebwizardry\:crystal_sorcery.name=Mystical Crystal
item.ebwizardry\:crystal_sorcery.desc=A crystal that glimmers with a bluish-green light. Maybe it conceals the secrets of an ancient force...
item.ebwizardry\:crystal_healing.name=Radiant Crystal
item.ebwizardry\:crystal_healing.desc=A crystal that glints a golden yellow in the sunlight. Perhaps it possesses the link to a divine power...
item.ebwizardry\:magic_wand.name=Magic Wand
item.ebwizardry\:apprentice_wand.name=Apprentice Wand
item.ebwizardry\:advanced_wand.name=Advanced Wand
item.ebwizardry\:master_wand.name=Master Wand
item.ebwizardry\:spell_book.name=Spell Book
item.ebwizardry\:spell_book.desc=A book filled with the runes and glyphs of an ancient script. Perhaps with dedication, one might be able to decipher its contents...\n\nRight-click while holding this book to read it.
item.ebwizardry\:spell_book.apply_to_wizard=Replaced %1$s's spell %2$s with %3$s
@@ -68,7 +73,8 @@ item.ebwizardry\:arcane_tome.name=Tome of Arcana
item.ebwizardry\:arcane_tome.desc=Upgrades any %1$s wand with sufficient progression to %2$s tier
item.ebwizardry\:wizard_handbook.name=The Wizard's Handbook
item.ebwizardry\:wizard_handbook.desc=by %1$s
item.ebwizardry\:wizard_handbook.author=by %1$s
item.ebwizardry\:wizard_handbook.desc=Your not-so-pocket-sized guide to the arcane arts! A must-have for any aspiring wizard who seeks to learn the secrets of magic.\n\nRight-click while holding this book to read it.
item.ebwizardry\:wand.generic=wand
@@ -82,6 +88,11 @@ item.ebwizardry\:wand.levelup=%1$s is ready to upgrade to %2$s tier
item.ebwizardry\:wand.addally=%1$s has been added to your list of allies
item.ebwizardry\:wand.removeally=%1$s has been removed from your list of allies
item.ebwizardry\:magic_wand.name=Magic Wand
item.ebwizardry\:apprentice_wand.name=Apprentice Wand
item.ebwizardry\:advanced_wand.name=Advanced Wand
item.ebwizardry\:master_wand.name=Master Wand
item.ebwizardry\:novice_fire_wand.name=Wand of Embers
item.ebwizardry\:novice_ice_wand.name=Wand of Frost
item.ebwizardry\:novice_lightning_wand.name=Wand of Sparks
@@ -126,12 +137,16 @@ item.ebwizardry\:medium_mana_flask.name=Medium Mana Flask
item.ebwizardry\:large_mana_flask.name=Large Mana Flask
item.ebwizardry\:grand_crystal.name=Grand Magic Crystal
item.ebwizardry\:grand_crystal.desc=A huge magic crystal, several times the size of those found naturally. Someone must have grown it artificially - but how?
item.ebwizardry\:crystal_shard.name=Magic Crystal Shard
item.ebwizardry\:crystal_shard.desc=A small piece of a shattered magic crystal. It contains little mana on its own, but it might have other uses...
item.ebwizardry\:astral_diamond.name=Astral Diamond
item.ebwizardry\:astral_diamond.desc=A highly-prized gemstone that sparkles brightly under starlight. It is said that the most powerful wizards seek astral diamonds in return for the most elusive arcane knowledge.
item.ebwizardry\:purifying_elixir.name=Purifying Elixir
item.ebwizardry\:purifying_elixir.desc=Removes curses when consumed
item.ebwizardry\:purifying_elixir.desc_extended=A small vial of exotic-looking golden liquid, which clearly has powerful healing properties. It would probably be wise to save this for when it is needed.
item.ebwizardry\:storage_upgrade.name=Wand Storage Upgrade
item.ebwizardry\:siphon_upgrade.name=Wand Siphon Upgrade
@@ -143,6 +158,8 @@ item.ebwizardry\:blast_upgrade.name=Wand Blast Upgrade
item.ebwizardry\:attunement_upgrade.name=Wand Attunement Upgrade
item.ebwizardry\:melee_upgrade.name=Wand Melee Upgrade
item.ebwizardry\:wand_upgrade.generic.desc=Apply this upgrade to a wand in the arcane workbench.
item.ebwizardry\:storage_upgrade.desc=Upgrades the mana capacity of a wand
item.ebwizardry\:siphon_upgrade.desc=Upgrades a wand to extract mana from mobs when killed
item.ebwizardry\:condenser_upgrade.desc=Upgrades a wand to slowly regenerate mana over time
@@ -168,13 +185,14 @@ item.ebwizardry\:blank_scroll.name=Blank Scroll
item.ebwizardry\:scroll.generic=scroll
item.ebwizardry\:scroll.name=Scroll of %1$s
item.ebwizardry\:scroll.undiscovered.name=Scroll "%1$s"
item.ebwizardry\:scroll.desc=An enchanted sheet of parchment bound loosely with string. Upon the parchment is written an incantation of some kind, presumably to be read aloud.\n\nRight-click while holding this scroll to use it.
item.ebwizardry\:identification_scroll.name=Scroll of Identification
item.ebwizardry\:identification_scroll.desc=Identifies an unknown spell book or scroll
item.ebwizardry\:identification_scroll.nothing_to_identify=Nothing to identify!
item.ebwizardry\:armour_upgrade.name=Arcane Seal of Protection
item.ebwizardry\:armour_upgrade.desc1=%1$sUpgrades any wizard armour
item.ebwizardry\:armour_upgrade.desc2=%1$sto make it %2$slegendary
item.ebwizardry\:armour_upgrade.desc=Upgrades any wizard armour to make it %1$slegendary
item.ebwizardry\:armour_upgrade.desc_extended=Apply this upgrade to a piece of wizard armour in the arcane workbench.
item.ebwizardry\:magic_silk.name=Magical Silk
@@ -232,6 +250,10 @@ item.ebwizardry\:spectral_boots.name=Spectral Boots
item.ebwizardry\:lightning_hammer.name=Lightning Hammer
item.ebwizardry\:ring.generic.desc=Equip this ring in the Baubles inventory or by placing it on your hotbar. Up to 2 rings may be equipped at once.
item.ebwizardry\:amulet.generic.desc=Equip this amulet in the Baubles inventory or by placing it on your hotbar. Only one amulet may be equipped at a time.
item.ebwizardry\:charm.generic.desc=Equip this charm in the Baubles inventory or by placing it on your hotbar. Only one charm may be equipped at a time.
item.ebwizardry\:ring_condensing.name=Ring of Condensing
item.ebwizardry\:ring_condensing.desc=Slowly regenerates mana for all wands on your hotbar
item.ebwizardry\:ring_siphoning.name=Ring of Siphoning