From 8989a12835e9330ef6bae95a15f3fec5da571105 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 20 Aug 2015 19:46:02 +0100 Subject: [PATCH] More taters :D --- .../render/tile/RenderTileTinyPotato.java | 72 +++++++++++++++++- .../item/material/ItemManaResource.java | 6 +- .../assets/botania/textures/items/nerfBat.png | Bin 0 -> 348 bytes 3 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/nerfBat.png diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index ab3116741..aa60fa580 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -13,10 +13,13 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; @@ -29,6 +32,7 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.item.TinyPotatoRenderEvent; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTinyPotato; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.material.ItemManaResource; @@ -48,6 +52,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { Minecraft mc = Minecraft.getMinecraft(); mc.renderEngine.bindTexture(texture); + String name = potato.name.toLowerCase(); GL11.glTranslatef(0.5F, 1.5F, 0.5F); GL11.glScalef(1F, -1F, -1F); @@ -65,10 +70,18 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glTranslatef(0F, up, 0F); GL11.glRotatef(rotZ, 0F, 0F, 1F); - model.render(); - GL11.glPushMatrix(); - String name = potato.name.toLowerCase(); + if(name.equals("pahimar")) { + GL11.glScalef(1F, 0.3F, 1F); + GL11.glTranslatef(0F, 3.5F, 0F); + } + + boolean render = !(name.equals("mami") || name.equals("soaryn") || (name.equals("eloraam") && jump != 0)); + if(render) + model.render(); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); mc.renderEngine.bindTexture(TextureMap.locationItemsTexture); float scale = 1F / 4F; @@ -79,6 +92,14 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glRotatef(90F, 0F, 1F, 0F); GL11.glRotatef(20F, 1F, 0F, 1F); renderIcon(((ItemManaResource) ModItems.manaResource).phiFlowerIcon); + + if(name.equals("vazkii")) { + GL11.glRotatef(-20F, 1F, 0F, 1F); + GL11.glScalef(1.25F, 1.25F, 1.25F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glTranslatef(-1.5F, -1.3F, -0.75F); + renderIcon(((ItemManaResource) ModItems.manaResource).nerfBatIcon); + } } else if(name.equals("skull kid")) { GL11.glScalef(1.25F, 1.25F, 1.25F); GL11.glRotatef(180F, 0F, 0F, 1F); @@ -115,7 +136,30 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glTranslatef(-0.5F, -0.7F, 0.1F); GL11.glRotatef(20F, 0F, 0F, 1F); renderIcon(ModItems.cosmetic.getIconFromDamage(24)); - } + } else if(name.equals("charlotte")) { + GL11.glScalef(1.25F, 1.25F, 1.25F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + renderIcon(ModItems.cosmetic.getIconFromDamage(12)); + } else if(name.equals("greg") || name.equals("gregorioust")) { + GL11.glScalef(1.25F, 1.25F, 1.25F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glTranslatef(-0.5F, -1.5F, -0.4F); + renderIcon(Items.book.getIconFromDamage(0)); + + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + GL11.glTranslatef(0.5F, 0.5F, 0F); + GL11.glScalef(0.3F, 0.3F, 0.3F); + + RenderBlocks.getInstance().renderBlockAsItem(Blocks.iron_ore, 0, 1F); + } else if(name.equals("profmobius")) { + GL11.glScalef(1.25F, 1.25F, 1.25F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + renderIcon(Items.bread.getIconFromDamage(0)); + } GL11.glPopMatrix(); MinecraftForge.EVENT_BUS.post(new TinyPotatoRenderEvent(potato, potato.name, d0, d1, d2, var8)); @@ -152,6 +196,26 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDepthMask(true); mc.fontRenderer.drawString(potato.name, -mc.fontRenderer.getStringWidth(potato.name) / 2, 0, 0xFFFFFF); + if(name.equals("pahimar") || name.equals("soaryn")) { + GL11.glTranslatef(0F, 14F, 0F); + String s = name.equals("pahimar") ? "[WIP]" : "(soon)"; + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glDisable(GL11.GL_TEXTURE_2D); + tessellator.startDrawingQuads(); + i = mc.fontRenderer.getStringWidth(s) / 2; + tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); + tessellator.addVertex(-i - 1, -1.0D, 0.0D); + tessellator.addVertex(-i - 1, 8.0D, 0.0D); + tessellator.addVertex(i + 1, 8.0D, 0.0D); + tessellator.addVertex(i + 1, -1.0D, 0.0D); + tessellator.draw(); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDepthMask(true); + mc.fontRenderer.drawString(s, -mc.fontRenderer.getStringWidth(s) / 2, 0, 0xFFFFFF); + } + GL11.glEnable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 76ae9d9f1..6d34840b4 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -48,10 +48,13 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve final int types = 22; IIcon[] icons; + // begin dank_memes public IIcon tailIcon = null; public IIcon phiFlowerIcon = null; public IIcon goldfishIcon = null; - + public IIcon nerfBatIcon = null; + // end dank_memes + public ItemManaResource() { super(); setUnlocalizedName(LibItemNames.MANA_RESOURCE); @@ -135,6 +138,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve tailIcon = IconHelper.forName(par1IconRegister, "tail"); phiFlowerIcon = IconHelper.forName(par1IconRegister, "phiFlower"); goldfishIcon = IconHelper.forName(par1IconRegister, "goldfish"); + nerfBatIcon = IconHelper.forName(par1IconRegister, "nerfBat"); } @Override diff --git a/src/main/resources/assets/botania/textures/items/nerfBat.png b/src/main/resources/assets/botania/textures/items/nerfBat.png new file mode 100644 index 0000000000000000000000000000000000000000..88efc359e154b4b0bd75091d750bd15ec27f2ed5 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;73mv$B+p3vr`?p4jBlzZZ1-kJCJ+5DgDJk zo8=X=Pw0P6;3%DL|MBpJX)XJ{H(v>xdiw8G(~lAJQ<-jWEA{=qrLOjy^P&)y!``e# zpKI^`e*4kxUFp>ut^xuv4|uk7eMst)QBZG;$eAyHFmn#81?Oyrvy88~VuCNtShW?!~Coc#Mw57W+_Z9sYbJrNt?lNp6s z&h_2BHHU$rqea%ojZx(dQ;pNt^hJyr?2}WOlxIAT_?ABNfRTZwxI}%()3g8G8v41< rZ+vt9K1Yx6>3?$$nr_VT%Z|U~bG!e;G@VkQ=NUX*{an^LB{Ts5v*nPg literal 0 HcmV?d00001