diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 7df72f7d0..e2bb9b207 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -170,9 +170,16 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.terrasteelChest); addItem(ModItems.terrasteelLegs); addItem(ModItems.terrasteelBoots); - addItem(ModItems.ancientWill); addItem(ModItems.phantomInk); + addItem(ModItems.ancientWill); addItem(ModItems.pinkinator); + addItem(ModItems.infiniteFruit); + addItem(ModItems.excaliber); + addItem(ModItems.flugelEye); + addItem(ModItems.thorRing); + addItem(ModItems.odinRing); + addItem(ModItems.lokiRing); + addItem(ModItems.aesirRing); addItem(ModItems.tinyPlanet); addBlock(ModBlocks.tinyPlanet); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index b6bce9e1e..ea4a4b508 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -82,6 +82,13 @@ import vazkii.botania.common.item.material.ItemPestleAndMortar; import vazkii.botania.common.item.material.ItemPetal; import vazkii.botania.common.item.material.ItemQuartz; import vazkii.botania.common.item.material.ItemRune; +import vazkii.botania.common.item.relic.ItemAesirRing; +import vazkii.botania.common.item.relic.ItemExcaliber; +import vazkii.botania.common.item.relic.ItemFlugelEye; +import vazkii.botania.common.item.relic.ItemInfiniteFruit; +import vazkii.botania.common.item.relic.ItemLokiRing; +import vazkii.botania.common.item.relic.ItemOdinRing; +import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.item.rod.ItemCobbleRod; import vazkii.botania.common.item.rod.ItemDirtRod; import vazkii.botania.common.item.rod.ItemDiviningRod; @@ -214,6 +221,13 @@ public final class ModItems { public static Item phantomInk; public static Item poolMinecart; public static Item pinkinator; + public static Item infiniteFruit; + public static Item excaliber; + public static Item flugelEye; + public static Item thorRing; + public static Item odinRing; + public static Item lokiRing; + public static Item aesirRing; public static void init() { lexicon = new ItemLexicon(); @@ -332,7 +346,14 @@ public final class ModItems { phantomInk = new ItemPhantomInk(); poolMinecart = new ItemPoolMinecart(); pinkinator = new ItemPinkinator(); - + infiniteFruit = new ItemInfiniteFruit(); + excaliber = new ItemExcaliber(); + flugelEye = new ItemFlugelEye(); + thorRing = new ItemThorRing(); + odinRing = new ItemOdinRing(); + lokiRing = new ItemLokiRing(); + aesirRing = new ItemAesirRing(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index bfc9a2da8..f5701cc15 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -47,31 +47,33 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt if(!EntityDoppleganger.isTruePlayer(par3EntityPlayer)) return par1ItemStack; - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(par3EntityPlayer); - for(int i = 0; i < baubles.getSizeInventory(); i++) { - if(baubles.isItemValidForSlot(i, par1ItemStack)) { - ItemStack stackInSlot = baubles.getStackInSlot(i); - if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, par3EntityPlayer)) { - if(!par2World.isRemote) { - baubles.setInventorySlotContents(i, par1ItemStack.copy()); - if(!par3EntityPlayer.capabilities.isCreativeMode) - par3EntityPlayer.inventory.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null); - } + if(canEquip(par1ItemStack, par3EntityPlayer)) { + InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(par3EntityPlayer); + for(int i = 0; i < baubles.getSizeInventory(); i++) { + if(baubles.isItemValidForSlot(i, par1ItemStack)) { + ItemStack stackInSlot = baubles.getStackInSlot(i); + if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, par3EntityPlayer)) { + if(!par2World.isRemote) { + baubles.setInventorySlotContents(i, par1ItemStack.copy()); + if(!par3EntityPlayer.capabilities.isCreativeMode) + par3EntityPlayer.inventory.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null); + } - onEquipped(par1ItemStack, par3EntityPlayer); + onEquipped(par1ItemStack, par3EntityPlayer); - if(stackInSlot != null) { - ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer); - return stackInSlot.copy(); + if(stackInSlot != null) { + ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer); + return stackInSlot.copy(); + } + break; } - break; } } } return par1ItemStack; } - + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/vazkii/botania/common/item/relic/IRelic.java b/src/main/java/vazkii/botania/common/item/relic/IRelic.java new file mode 100644 index 000000000..e79206d96 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/IRelic.java @@ -0,0 +1,24 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 7:17:41 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; + +public interface IRelic { + + public String getSoulbindUsername(ItemStack stack); + + public void setBindAchievement(Achievement achievement); + + public Achievement getBindAchievement(); + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java new file mode 100644 index 000000000..3183db765 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -0,0 +1,28 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 10:16:29 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import net.minecraft.item.ItemStack; +import baubles.api.BaubleType; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemAesirRing extends ItemRelicBauble { + + public ItemAesirRing() { + super(LibItemNames.AESIR_RING); + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.RING; + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java new file mode 100644 index 000000000..cd3ec288f --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -0,0 +1,22 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 10:12:50 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import vazkii.botania.common.lib.LibItemNames; +import net.minecraft.stats.Achievement; + +public class ItemExcaliber extends ItemRelic { + + public ItemExcaliber() { + super(LibItemNames.EXCALIBER); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java new file mode 100644 index 000000000..a3342f238 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -0,0 +1,21 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 10:13:26 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemFlugelEye extends ItemRelic { + + public ItemFlugelEye() { + super(LibItemNames.FLUGEL_EYE); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java new file mode 100644 index 000000000..b8d3efbb6 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -0,0 +1,21 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 10:12:55 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import vazkii.botania.common.lib.LibItemNames; + +public class ItemInfiniteFruit extends ItemRelic { + + public ItemInfiniteFruit() { + super(LibItemNames.INFINITE_FRUIT); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java new file mode 100644 index 000000000..a5ace0a32 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -0,0 +1,28 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 10:13:32 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import net.minecraft.item.ItemStack; +import baubles.api.BaubleType; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemLokiRing extends ItemRelicBauble { + + public ItemLokiRing() { + super(LibItemNames.LOKI_RING); + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.RING; + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java new file mode 100644 index 000000000..87c5c16a6 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -0,0 +1,28 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 10:13:41 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import net.minecraft.item.ItemStack; +import baubles.api.BaubleType; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemOdinRing extends ItemRelicBauble { + + public ItemOdinRing() { + super(LibItemNames.ODIN_RING); + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.RING; + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java new file mode 100644 index 000000000..d0ee6f7f7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -0,0 +1,108 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 7:54:40 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.util.DamageSource; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.ItemMod; + +public class ItemRelic extends ItemMod implements IRelic { + + private static final String TAG_SOULBIND = "soulbind"; + + Achievement achievement; + + public ItemRelic(String name) { + setUnlocalizedName(name); + setMaxStackSize(1); + } + + @Override + public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { + if(p_77663_3_ instanceof EntityPlayer) + updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + } + + @Override + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); + } + + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + String bind = getSoulbindUsernameS(stack); + if(bind.isEmpty()) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.relicUnbound"), list); + else { + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), bind), list); + if(!isRightPlayer(player, stack)) + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), bind), list); + } + } + + static void addStringToTooltip(String s, List tooltip) { + tooltip.add(s.replaceAll("&", "\u00a7")); + } + + public static String getSoulbindUsernameS(ItemStack stack) { + return ItemNBTHelper.getString(stack, TAG_SOULBIND, ""); + } + + public static void updateRelic(ItemStack stack, EntityPlayer player) { + String soulbind = getSoulbindUsernameS(stack); + if(soulbind.isEmpty()) { + bindToPlayer(player, stack); + soulbind = getSoulbindUsernameS(stack); + } + + if(!isRightPlayer(player, stack) && player.ticksExisted % 10 == 0) + player.attackEntityFrom(damageSource(), 6); + } + + public static void bindToPlayer(EntityPlayer player, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOULBIND, player.getCommandSenderName()); + } + + public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { + return isRightPlayer(player.getCommandSenderName(), stack); + } + + public static boolean isRightPlayer(String player, ItemStack stack) { + return getSoulbindUsernameS(stack).equals(player); + } + + public static DamageSource damageSource() { + return new DamageSource("botania-relic"); + } + + @Override + public String getSoulbindUsername(ItemStack stack) { + return getSoulbindUsernameS(stack); + } + + @Override + public Achievement getBindAchievement() { + return achievement; + } + + @Override + public void setBindAchievement(Achievement achievement) { + this.achievement = achievement; + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java new file mode 100644 index 000000000..d52dcdcfa --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -0,0 +1,78 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 7:56:27 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.world.World; +import vazkii.botania.common.item.equipment.bauble.ItemBauble; + +public abstract class ItemRelicBauble extends ItemBauble implements IRelic { + + Achievement achievement; + + public ItemRelicBauble(String name) { + super(name); + } + + @Override + public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { + if(p_77663_3_ instanceof EntityPlayer) + ItemRelic.updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + } + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + super.onWornTick(stack, player); + if(player instanceof EntityPlayer) { + EntityPlayer ePlayer = (EntityPlayer) player; + ItemRelic.updateRelic(stack, ePlayer); + if(ItemRelic.isRightPlayer(ePlayer, stack)) + onValidPlayerWornTick(stack, ePlayer); + } + } + + @Override + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); + ItemRelic.addBindInfo(par3List, par1ItemStack, par2EntityPlayer); + } + + public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { + // NO-OP + } + + @Override + public boolean canEquip(ItemStack stack, EntityLivingBase player) { + return player instanceof EntityPlayer && ItemRelic.isRightPlayer((EntityPlayer) player, stack); + } + + @Override + public String getSoulbindUsername(ItemStack stack) { + return ItemRelic.getSoulbindUsernameS(stack); + } + + @Override + public Achievement getBindAchievement() { + return achievement; + } + + @Override + public void setBindAchievement(Achievement achievement) { + this.achievement = achievement; + } + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java new file mode 100644 index 000000000..1bde37a86 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -0,0 +1,28 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 29, 2015, 10:13:37 PM (GMT)] + */ +package vazkii.botania.common.item.relic; + +import net.minecraft.item.ItemStack; +import baubles.api.BaubleType; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemThorRing extends ItemRelicBauble { + + public ItemThorRing() { + super(LibItemNames.THOR_RING); + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.RING; + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 08d35a963..c7736baa3 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -129,7 +129,14 @@ public final class LibItemNames { public static final String PHANTOM_INK = "phantomInk"; public static final String POOL_MINECART = "poolMinecart"; public static final String PINKINATOR = "pinkinator"; - + public static final String INFINITE_FRUIT = "infiniteFruit"; + public static final String EXCALIBER = "excaliber"; + public static final String FLUGEL_EYE = "flugelEye"; + public static final String THOR_RING = "thorRing"; + public static final String ODIN_RING = "odinRing"; + public static final String LOKI_RING = "lokiRing"; + public static final String AESIR_RING = "aesirRing"; + public static final String[] LENS_NAMES = new String[] { "lensNormal", "lensSpeed", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 044b3cb7c..ea5eeb731 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -95,6 +95,9 @@ botaniamisc.lexiconOptions1=Configure Botania from ingame botaniamisc.lexiconOptions2=Some options might need a game restart botaniamisc.hasPhantomInk=&bTinged with Phantom Ink botaniamisc.pinkinatorDesc=Apply directly to Wither +botaniamisc.relicUnbound=&6Relic&7, Unbound +botaniamisc.relicSoulbound=&6Relic&7, Soulbound to &f%s +botaniamisc.notYourSagittarius=&4This relic is not yours # NEI INTEGRATION botania.nei.brewery=Botanical Brewery @@ -308,6 +311,9 @@ botania.baubletype.ring=Equippable in the &aRing&7 slot botania.baubletype.belt=Equippable in the &aBelt&7 slot botania.baubletooltip=Press &b%key%&7 to open the Baubles menu +# DEATH MESSAGES +death.attack.botania-relic=%s was punished for using a relic that isn't theirs + # ENTITY NAMES entity.Botania.botania:manaBurst.name=Mana Burst entity.Botania.botania:signalFlare.name=Signal Flare @@ -1148,6 +1154,14 @@ item.botania:flowerBag.name=Flower Pouch item.botania:phantomInk.name=Phantom Ink item.botania:poolMinecart.name=Minecart with Mana Pool item.botania:pinkinator.name=The Pinkinator +item.botania:infiniteFruit.name=The Fruit of Grisaia +item.botania:excaliber.name=Holy Sword Excaliber +item.botania:flugelEye.name=Eye of the Flügel +item.botania:thorRing.name=Ring of Thor +item.botania:odinRing.name=Ring of Odin +item.botania:lokiRing.name=Ring of Loki +item.botania:aesirRing.name=Ring of the Aesir +item.botania:relicDice.name=Dice of Fate # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/textures/items/aesirRing.png b/src/main/resources/assets/botania/textures/items/aesirRing.png new file mode 100644 index 000000000..1997e3a57 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/aesirRing.png differ diff --git a/src/main/resources/assets/botania/textures/items/excaliber.png b/src/main/resources/assets/botania/textures/items/excaliber.png new file mode 100644 index 000000000..70e117cea Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/excaliber.png differ diff --git a/src/main/resources/assets/botania/textures/items/flugelEye.png b/src/main/resources/assets/botania/textures/items/flugelEye.png new file mode 100644 index 000000000..8f5d92545 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/flugelEye.png differ diff --git a/src/main/resources/assets/botania/textures/items/infiniteFruit.png b/src/main/resources/assets/botania/textures/items/infiniteFruit.png new file mode 100644 index 000000000..204cfc500 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/infiniteFruit.png differ diff --git a/src/main/resources/assets/botania/textures/items/lokiRing.png b/src/main/resources/assets/botania/textures/items/lokiRing.png new file mode 100644 index 000000000..e92e05e96 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/lokiRing.png differ diff --git a/src/main/resources/assets/botania/textures/items/odinRing.png b/src/main/resources/assets/botania/textures/items/odinRing.png new file mode 100644 index 000000000..f078835fa Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/odinRing.png differ diff --git a/src/main/resources/assets/botania/textures/items/thorRing.png b/src/main/resources/assets/botania/textures/items/thorRing.png new file mode 100644 index 000000000..1c6a3a22a Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/thorRing.png differ diff --git a/src/main/resources/assets/botania/textures/items/unused/voidRing.png b/src/main/resources/assets/botania/textures/items/unused/voidRing.png index 7bef97018..39e44d696 100644 Binary files a/src/main/resources/assets/botania/textures/items/unused/voidRing.png and b/src/main/resources/assets/botania/textures/items/unused/voidRing.png differ