From 99c7aa0270fdd731567cb170f291c8ec96b5cbbf Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 18 Oct 2015 01:18:05 +0100 Subject: [PATCH] Mana Cookie renamed to Biscuit of Totality. --- .../botania/common/item/ItemManaCookie.java | 14 ++++++++++++++ .../resources/assets/botania/lang/en_US.lang | 6 +++--- .../botania/textures/items/totalBiscuit.png | Bin 0 -> 18043 bytes 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/totalBiscuit.png diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 90757153c..3c897d55e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -16,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; @@ -28,6 +29,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { + private IIcon totalBiscuitIcon; + public ItemManaCookie() { super(0, 0.1F, false); setPotionEffect(Potion.field_76443_y.id, 1, 0, 1F); @@ -51,11 +54,22 @@ public class ItemManaCookie extends ItemFood { public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return getIconIndex(stack); + } + @Override + public IIcon getIconIndex(ItemStack stack) { + return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { itemIcon = IconHelper.forItem(par1IconRegister, this); + totalBiscuitIcon = IconHelper.forName(par1IconRegister, "totalBiscuit"); } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 14e61c1bb..0903401f5 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -429,7 +429,7 @@ achievement.botania:sparkCraft.desc=Make a Spark to help transfer Mana around achievement.botania:baubleWear=Inner Arts achievement.botania:baubleWear.desc=Craft any variety of Bauble and wear it achievement.botania:manaCookieEat=Rotten Heresy and Chocolate -achievement.botania:manaCookieEat.desc=Infuse and eat a delicious Mana Cookie +achievement.botania:manaCookieEat.desc=Infuse and eat a delicious Biscuit of Totality achievement.botania:runePickup=Lilium Doll achievement.botania:runePickup.desc=Use a Runic Altar to create a Rune achievement.botania:manaBlasterShoot=M'aider Stranded Girl @@ -1374,7 +1374,7 @@ item.botania:signalFlare.name=Signal Flare item.botania:manaTablet.name=Mana Tablet item.botania:manaGun.name=Mana Blaster item.botania:compositeLens.name=Composite Mana Lens: %s %s -item.botania:manaCookie.name=Mana Cookie +item.botania:manaCookie.name=Biscuit of Totality item.botania:fertilizer.name=Floral Fertilizer item.botania:grassSeeds0.name=Pasture Seeds item.botania:grassSeeds1.name=Boreal Seeds @@ -2065,7 +2065,7 @@ botania.page.pool6=Infusing &1Mana Petals&0 botania.page.pool11=Infusing &1Managlass&0, clear seamless glass. botania.page.pool12=Infusing &1String&0 botania.page.pool13=Used &1Mana Infused String&0 to make &1Cobwebs&0 -botania.page.pool7=Infusing &1Mana Cookies&0, pretty good food. +botania.page.pool7=A total space biscuit # -- SPARKS botania.entry.sparks=Sparks diff --git a/src/main/resources/assets/botania/textures/items/totalBiscuit.png b/src/main/resources/assets/botania/textures/items/totalBiscuit.png new file mode 100644 index 0000000000000000000000000000000000000000..787c8c690bf2c6228a33b1074afd08ee83a7658a GIT binary patch literal 18043 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 O*UD_OX`adML;nNknfqS= literal 0 HcmV?d00001