From 508b71a95faf175ba60191c9de53a78a312f2374 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 22 Oct 2016 22:22:11 +0100 Subject: [PATCH] Third Eye. --- .../core/handler/MiscellaneousIcons.java | 5 + .../common/core/BotaniaCreativeTab.java | 1 + .../vazkii/botania/common/item/ModItems.java | 5 +- .../item/equipment/bauble/ItemThirdEye.java | 122 ++++++++++++++++++ .../botania/common/lib/LibItemNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 1 + .../assets/botania/models/item/thirdEye.json | 8 ++ .../textures/items/{unused => }/thirdEye0.png | Bin 14870 -> 15453 bytes .../textures/items/{unused => }/thirdEye1.png | Bin 16310 -> 15867 bytes .../textures/items/{unused => }/thirdEye2.png | Bin .../items/{unused => }/thirdEye2.png.mcmeta | 0 11 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java create mode 100644 src/main/resources/assets/botania/models/item/thirdEye.json rename src/main/resources/assets/botania/textures/items/{unused => }/thirdEye0.png (93%) rename src/main/resources/assets/botania/textures/items/{unused => }/thirdEye1.png (91%) rename src/main/resources/assets/botania/textures/items/{unused => }/thirdEye2.png (100%) rename src/main/resources/assets/botania/textures/items/{unused => }/thirdEye2.png.mcmeta (100%) diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index ec8480918..7cfb4b395 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -72,6 +72,7 @@ public class MiscellaneousIcons { public TextureAtlasSprite[] kingKeyWeaponIcons; public final Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); public TextureAtlasSprite[] tiaraWingIcons; + public TextureAtlasSprite[] thirdEyeLayers; // begin dank_memes public TextureAtlasSprite tailIcon = null; @@ -147,6 +148,10 @@ public class MiscellaneousIcons { kingKeyWeaponIcons = new TextureAtlasSprite[ItemKingKey.WEAPON_TYPES]; for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) kingKeyWeaponIcons[i] = IconHelper.forName(evt.getMap(), "gateWeapon" + i, "items"); + + thirdEyeLayers = new TextureAtlasSprite[3]; + for(int i = 0; i < 3; i++) + thirdEyeLayers[i] = IconHelper.forName(evt.getMap(), "thirdEye" + i, "items"); manaDetectorIcon = IconHelper.forName(evt.getMap(), "triggers/manaDetector", "items"); runeAltarTriggerIcon = IconHelper.forName(evt.getMap(), "triggers/runeAltarCanCraft", "items"); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 113994314..e9a3259d2 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -257,6 +257,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.balanceCloak); addItem(ModItems.goldLaurel); addItem(ModItems.divaCharm); + addItem(ModItems.thirdEye); addItem(ModItems.flightTiara); addItem(ModItems.manaTablet); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index b058100bc..95d0f80ad 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -64,6 +64,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemSuperCloudPendant; import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant; import vazkii.botania.common.item.equipment.bauble.ItemSuperTravelBelt; import vazkii.botania.common.item.equipment.bauble.ItemSwapRing; +import vazkii.botania.common.item.equipment.bauble.ItemThirdEye; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; import vazkii.botania.common.item.equipment.bauble.ItemTravelBelt; import vazkii.botania.common.item.equipment.bauble.ItemUnholyCloak; @@ -275,6 +276,7 @@ public final class ModItems { public static Item invisibilityCloak; public static Item cloudPendant; public static Item superCloudPendant; + public static Item thirdEye; public static void init() { lexicon = new ItemLexicon(); @@ -427,7 +429,8 @@ public final class ModItems { invisibilityCloak = new ItemInvisibilityCloak(); cloudPendant = new ItemCloudPendant(); superCloudPendant = new ItemSuperCloudPendant(); - + thirdEye = new ItemThirdEye(); + 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/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java new file mode 100644 index 000000000..34a903abf --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -0,0 +1,122 @@ +/** + * 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 @ [22/10/2016, 20:18:44 (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import java.util.List; + +import baubles.api.BaubleType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.relauncher.Side; +import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemThirdEye extends ItemBauble implements IManaUsingItem, IBaubleRender { + + private static final int COST = 2; + + public ItemThirdEye() { + super(LibItemNames.THIRD_EYE); + } + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + super.onWornTick(stack, player); + + if(!(player instanceof EntityPlayer)) + return; + EntityPlayer eplayer = (EntityPlayer) player; + + double range = 24; + AxisAlignedBB aabb = new AxisAlignedBB(player.posX, player.posY, player.posZ, player.posX, player.posY, player.posZ).expand(range, range, range); + List mobs = player.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, aabb, (Entity e) -> e instanceof IMob); + + if(!mobs.isEmpty()) + for(EntityLivingBase e : mobs) { + PotionEffect potion = e.getActivePotionEffect(MobEffects.GLOWING); + if((potion == null || potion.getDuration() <= 2) && ManaItemHandler.requestManaExact(stack, eplayer, COST, true)) + e.addPotionEffect(new PotionEffect(MobEffects.GLOWING, 12, 0)); + } + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.BODY; + } + + @Override + public boolean usesMana(ItemStack stack) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { + if(type == RenderType.BODY) { + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + Helper.rotateIfSneaking(player); + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + double scale = 0.6; + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(-0.3, -0.6, armor ? -0.18 : -0.12); + GlStateManager.scale(scale, scale, scale); + + for(int i = 0; i < 3; i++) { + GlStateManager.pushMatrix(); + float width = 1F / 16F; + switch(i) { + case 0: break; + case 1: + double scale1 = 0.75; + width /= 2F; + + GlStateManager.translate(0.15, 0.15, -0.05); + double time = ClientTickHandler.total * 0.12; + double dist = 0.05; + GlStateManager.translate(Math.sin(time) * dist, Math.cos(time * 0.5) * dist, 0); + + GlStateManager.scale(scale1, scale1, scale1); + break; + case 2: + GlStateManager.translate(0, 0, -0.05); + break; + } + + TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.thirdEyeLayers[i]; + float f = gemIcon.getMinU(); + float f1 = gemIcon.getMaxU(); + float f2 = gemIcon.getMinV(); + float f3 = gemIcon.getMaxV(); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), width); + GlStateManager.popMatrix(); + } + } + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 73e663054..e5bfd46ac 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -164,6 +164,7 @@ public final class LibItemNames { public static final String INVISIBILITY_CLOAK = "invisibilityCloak"; public static final String CLOUD_PENDANT = "cloudPendant"; public static final String SUPER_CLOUD_PENDANT = "superCloudPendant"; + public static final String THIRD_EYE = "thirdEye"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 3e0e59f03..e1d628d7a 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1607,6 +1607,7 @@ item.botania:dodgeRing.name=Ring of Dexterous Motion item.botania:invisibilityCloak.name=Invisibility Cloak item.botania:cloudPendant.name=Cirrus Amulet item.botania:superCloudPendant.name=Nimbus Amulet +item.botania:thirdEye.name=Third Eye # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/models/item/thirdEye.json b/src/main/resources/assets/botania/models/item/thirdEye.json new file mode 100644 index 000000000..362c5a52c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thirdEye.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/thirdEye0", + "layer1": "botania:items/thirdEye1", + "layer2": "botania:items/thirdEye2" + } +} diff --git a/src/main/resources/assets/botania/textures/items/unused/thirdEye0.png b/src/main/resources/assets/botania/textures/items/thirdEye0.png similarity index 93% rename from src/main/resources/assets/botania/textures/items/unused/thirdEye0.png rename to src/main/resources/assets/botania/textures/items/thirdEye0.png index e0a71d66e95fceb8839d8abd850fef644b8410e8..0ed9bfc99e45307be77d6353cba9c32e208eaa97 100644 GIT binary patch delta 439 zcmbPMa<^iF1(P+?MyncTZX=@*BO@zA11lrT$p@LOk@=h1Sq?I)q@@{}B&H>r=$a-b zS?HRZnV9M(B^d$<^Az*6B;&+n3lq!DZ&>FsO+LlKHJO{;nz=Z!Y_d1I9Z@XnrZVLO@(@vByhGn>LYy)*aH*_ck#1&R%Aa>pr3B zU#OaK<;fJIMXSyP9`VsVW8wWQHzsq>rKkzAuj}?+pUrP@HTJ>B%8!3sCuRFGGf#-% zKQ}4x@(R{tg>M+=6tgi+n0)WBtprQpcCprv_3(6Y45_%4^yB}3duG)ci65jse0h2K|A`qH%n4F)d#hTT3ME^v zGL)P>(e}WUVSZXn8;?1&2A|6+7v-aznJ-e+7=Ymae`bcOuI61QRsKE)@jYGrT-G@y GGywoSu0AgS diff --git a/src/main/resources/assets/botania/textures/items/unused/thirdEye1.png b/src/main/resources/assets/botania/textures/items/thirdEye1.png similarity index 91% rename from src/main/resources/assets/botania/textures/items/unused/thirdEye1.png rename to src/main/resources/assets/botania/textures/items/thirdEye1.png index 023b35a75aa13873623306bc06e8e10193e7c80f..2dca5364d17ef9b5d01fc3b933ad756f0b7948cf 100644 GIT binary patch delta 365 zcmdm1|GRpE1(VIGjaD_x+(t$rMut|VW>&@)lMgamBl9=2vm9hpF)~auGe|Kt&`mZ? zw$x2EFfr7%urN>4HAyrvO)^L^Otvsi+x&(#jb$=FyX)k;9F9ckn7o_a3fZnn98Ht& zv2$$}=CU?qnQPKlKRL)+ubyGGr;B4q#jPik47pkiL|o#h)$D1B-DT2v=ag`zwqonS zV}AUK@n^~o>7Ckj*gCQJb-hGc+|eJVf;QopRN_#~mFBYh7KOR=oaY z<>2CTZl;8CXsBTFlHBN`bIFVdQ&MBb@0Oqobz5oCK delta 1156 zcmexey{&$N1(UVFMyncTZbP#WLrW`Tb1M_0$p@LOk@=h1Sq?Hzmg7|0{Ejt+Wit=Y z9|M+o&6~<5^VsUuvnY7FIEGX(G6=A||IPUS|9=Kb028U2>(MokYyxElVAu~dj$$XU zpu1_Wn>$$OUq2bX{`m!_dFAENZHDu)8u0ny zLk2-Mb_Q-1HZWb!Eh!1tfzH4%0TgB*Zr)-rGB#pR;^79iAL@aOki&INyMb&kN6{y_F30j!=tk|)T-XMi0+-5>?P;Q9ZbYlElr Sg_4z)AOTNTKbLh*2~7Y)vTpML diff --git a/src/main/resources/assets/botania/textures/items/unused/thirdEye2.png b/src/main/resources/assets/botania/textures/items/thirdEye2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/thirdEye2.png rename to src/main/resources/assets/botania/textures/items/thirdEye2.png diff --git a/src/main/resources/assets/botania/textures/items/unused/thirdEye2.png.mcmeta b/src/main/resources/assets/botania/textures/items/thirdEye2.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/thirdEye2.png.mcmeta rename to src/main/resources/assets/botania/textures/items/thirdEye2.png.mcmeta