From 7498cc8d08e59162422a9d337e13e10384a5fd65 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 24 Jan 2015 15:18:07 +0000 Subject: [PATCH] Added the Manaseer Monocle. --- .../botania/api/item/IBurstViewerBauble.java | 21 +++++++ .../client/core/proxy/ClientProxy.java | 12 ++++ .../common/core/BotaniaCreativeTab.java | 1 + .../common/core/proxy/CommonProxy.java | 4 ++ .../common/entity/EntityManaBurst.java | 9 ++- .../vazkii/botania/common/item/ModItems.java | 7 ++- .../item/equipment/bauble/ItemMonocle.java | 58 ++++++++++++++++++ .../botania/common/lib/LibItemNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 1 + .../assets/botania/textures/items/monocle.png | Bin 0 -> 18683 bytes 10 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/item/IBurstViewerBauble.java create mode 100644 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java create mode 100644 src/main/resources/assets/botania/textures/items/monocle.png diff --git a/src/main/java/vazkii/botania/api/item/IBurstViewerBauble.java b/src/main/java/vazkii/botania/api/item/IBurstViewerBauble.java new file mode 100644 index 000000000..a6502567a --- /dev/null +++ b/src/main/java/vazkii/botania/api/item/IBurstViewerBauble.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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 24, 2015, 3:08:40 PM (GMT)] + */ +package vazkii.botania.api.item; + +/** + * Base Interface for the Manaseer Monocle and items of the sort. + * Having a IBauble of this type equipped on the 0th slot (amulet) + * will draw bursts without depth testing. + */ +public interface IBurstViewerBauble { + +} diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index da118cb5a..8f78ee3c5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -15,6 +15,8 @@ import java.awt.Desktop; import java.net.URI; import java.util.Calendar; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; @@ -23,12 +25,14 @@ import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; +import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wiki.IWikiProvider; @@ -221,6 +225,14 @@ public class ClientProxy extends CommonProxy { public boolean isTheClientPlayer(EntityLivingBase entity) { return entity == Minecraft.getMinecraft().thePlayer; } + + @Override + public boolean isClientPlayerWearingMonocle() { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); + ItemStack stack = inv.getStackInSlot(0); + return stack != null && stack.getItem() instanceof IBurstViewerBauble; + } @Override public void setExtraReach(EntityLivingBase entity, float reach) { diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 51ba055b8..4c46c0251 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -246,6 +246,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.superTravelBelt); addItem(ModItems.knockbackBelt); addItem(ModItems.itemFinder); + addItem(ModItems.monocle); addItem(ModItems.icePendant); addItem(ModItems.lavaPendant); addItem(ModItems.superLavaPendant); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index d4e143466..41e7ace2f 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -129,6 +129,10 @@ public class CommonProxy { public boolean isTheClientPlayer(EntityLivingBase entity) { return false; } + + public boolean isClientPlayerWearingMonocle() { + return false; + } public void setExtraReach(EntityLivingBase entity, float reach) { if(entity instanceof EntityPlayerMP) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 443ed8b4e..fe0294c7b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -472,7 +472,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { ILensEffect lens = getLensInstance(); if(lens != null && !lens.doParticles(this, getSourceLens())) return; - + Color color = new Color(getColor()); float r = color.getRed() / 255F; float g = color.getGreen() / 255F; @@ -492,6 +492,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(!noParticles && shouldDoFakeParticles()) Botania.proxy.sparkleFX(worldObj, posX, posY, posZ, r, g, b, 0.4F * size, 1, true); } else { + boolean monocle = Botania.proxy.isClientPlayerWearingMonocle(); + if(monocle) + Botania.proxy.setWispFXDepthTest(false); + if(ConfigHandler.subtlePowerSystem) Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.1F * size, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.01F); else { @@ -533,6 +537,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { posY = savedPosY; posZ = savedPosZ; } + + if(monocle) + Botania.proxy.setWispFXDepthTest(true); } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index bc026210b..d28e58dc7 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -44,6 +44,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemLavaPendant; import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.item.equipment.bauble.ItemManaRing; import vazkii.botania.common.item.equipment.bauble.ItemMiningRing; +import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.item.equipment.bauble.ItemPixieRing; import vazkii.botania.common.item.equipment.bauble.ItemReachRing; import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant; @@ -188,7 +189,8 @@ public final class ModItems { public static Item unholyCloak; public static Item craftingHalo; public static Item blackLotus; - + public static Item monocle; + public static void init() { lexicon = new ItemLexicon(); petal = new ItemPetal(); @@ -287,7 +289,8 @@ public final class ModItems { unholyCloak = new ItemUnholyCloak(); craftingHalo = new ItemCraftingHalo(); blackLotus = new ItemBlackLotus(); - + monocle = new ItemMonocle(); + 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/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java new file mode 100644 index 000000000..11719c699 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -0,0 +1,58 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 24, 2015, 3:03:18 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.api.item.IBurstViewerBauble; +import vazkii.botania.api.item.IBaubleRender.Helper; +import vazkii.botania.api.item.IBaubleRender.RenderType; +import vazkii.botania.common.lib.LibItemNames; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.RenderPlayerEvent; +import baubles.api.BaubleType; + +public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, IBaubleRender { + + public ItemMonocle() { + super(LibItemNames.MONOCLE); + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.AMULET; + } + + @Override + public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + if(type == RenderType.HEAD) { + float f = itemIcon.getMinU(); + float f1 = itemIcon.getMaxU(); + float f2 = itemIcon.getMinV(); + float f3 = itemIcon.getMaxV(); + boolean armor = event.entityPlayer.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(event.entityPlayer); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glRotatef(180F, 1F, 0F, 0F); + GL11.glTranslatef(-0.35F, -0.1F, armor ? -0.3F : -0.25F); + GL11.glScalef(0.35F, 0.35F, 0.35F); + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index f82b70280..72fc2b27c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -111,6 +111,7 @@ public final class LibItemNames { public static final String UNHOLY_CLOAK = "unholyCloak"; public static final String CRAFTING_HALO = "craftingHalo"; public static final String BLACK_LOTUS = "blackLotus"; + public static final String MONOCLE = "monocle"; 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 7aec1a1ec..1360a3f7f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -797,6 +797,7 @@ item.botania:craftingHalo.name=Assembly Halo item.botania:blackLotus0.name=Black Lotus item.botania:blackLotus1.name=Void Lotus item.botania:dreamwoodTwig.name=Dreamwood Twig +item.botania:monocle.name=Manaseer Monocle # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/textures/items/monocle.png b/src/main/resources/assets/botania/textures/items/monocle.png new file mode 100644 index 0000000000000000000000000000000000000000..f1124458b055e63115f0eca5e6bec986d686bcd6 GIT binary patch literal 18683 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 literal 0 HcmV?d00001