diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index e1c3aab60..2f8042bd8 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -256,6 +256,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.holyCloak); addItem(ModItems.unholyCloak); addItem(ModItems.balanceCloak); + addItem(ModItems.goddessCharm); addItem(ModItems.goldLaurel); addItem(ModItems.divaCharm); addItem(ModItems.thirdEye); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 284a2293b..07bc4b1db 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemCloudPendant; import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; +import vazkii.botania.common.item.equipment.bauble.ItemGoddessCharm; import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel; import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; @@ -278,6 +279,7 @@ public final class ModItems { public static Item superCloudPendant; public static Item thirdEye; public static Item astrolabe; + public static Item goddessCharm; public static void init() { lexicon = new ItemLexicon(); @@ -432,7 +434,8 @@ public final class ModItems { superCloudPendant = new ItemSuperCloudPendant(); thirdEye = new ItemThirdEye(); astrolabe = new ItemAstrolabe(); - + goddessCharm = new ItemGoddessCharm(); + 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/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java new file mode 100644 index 000000000..54e975fe3 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -0,0 +1,84 @@ +/** + * 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 @ [Oct 30, 2016, 6:22:03 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import java.util.List; + +import baubles.api.BaubleType; +import baubles.api.BaublesApi; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.Explosion; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.ExplosionEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { + + public static final int COST = 1000; + + public ItemGoddessCharm() { + super(LibItemNames.GODDESS_CHARM); + MinecraftForge.EVENT_BUS.register(ItemGoddessCharm.class); + } + + @SubscribeEvent + public static void onExplosion(ExplosionEvent.Detonate event) { + Explosion e = event.getExplosion(); + List players = event.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(e.getPosition(), e.getPosition()).expand(8, 8, 8)); + + for(EntityPlayer player : players) { + IInventory inv = BaublesApi.getBaubles(player); + ItemStack charm = inv.getStackInSlot(6); + if(charm != null && charm.getItem() instanceof ItemGoddessCharm && ManaItemHandler.requestManaExact(charm, player, COST, true)) { + event.getAffectedBlocks().clear(); + return; + } + } + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.CHARM; + } + + @Override + @SideOnly(Side.CLIENT) + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { + if (type == RenderType.HEAD) { + GlStateManager.pushMatrix(); + Helper.translateToHeadLevel(player); + Helper.translateToFace(); + Helper.defaultTransforms(); + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.translate(0.5F, 0.2F, 0.45F); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); + GlStateManager.popMatrix(); + } + } + + @Override + public boolean usesMana(ItemStack stack) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 513481750..eb1df29e4 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -166,7 +166,8 @@ public final class LibItemNames { public static final String SUPER_CLOUD_PENDANT = "superCloudPendant"; public static final String THIRD_EYE = "thirdEye"; public static final String ASTROLABE = "astrolabe"; - + public static final String GODDESS_CHARM = "goddessCharm"; + 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 6b74851dc..81252716d 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1609,6 +1609,7 @@ item.botania:cloudPendant.name=Cirrus Amulet item.botania:superCloudPendant.name=Nimbus Amulet item.botania:thirdEye.name=Third Eye item.botania:astrolabe.name=Worldshaper's Astrolabe +item.botania:goddessCharm.name=Benevolent Goddess' Charm # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/models/item/goddessCharm.json b/src/main/resources/assets/botania/models/item/goddessCharm.json new file mode 100644 index 000000000..946b6c992 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/goddessCharm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/goddessCharm" + } +} diff --git a/src/main/resources/assets/botania/textures/items/unused/peacefulGoddessCharm.png b/src/main/resources/assets/botania/textures/items/goddessCharm.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/peacefulGoddessCharm.png rename to src/main/resources/assets/botania/textures/items/goddessCharm.png