From f667261d6954291d9aa4c79d7a0f3395557aa646 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 20 Jun 2015 00:48:16 +0100 Subject: [PATCH] Added evil dev stuff. --- .../handler/ContributorFancinessHandler.java | 46 ++++++++++++++++-- .../item/material/ItemManaResource.java | 4 ++ .../botania/textures/items/goldfish.png | Bin 0 -> 18412 bytes .../cosmetic_phi.png => phiFlower.png} | Bin web/changelog.txt | 2 + 5 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/goldfish.png rename src/main/resources/assets/botania/textures/items/{unused/cosmetic_phi.png => phiFlower.png} (100%) diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 9436bcf54..a39d296a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -51,7 +51,11 @@ public final class ContributorFancinessHandler { String name = event.entityPlayer.getDisplayName(); if(name.equals("Vazkii")) - renderFancyExclusiveDevStuffBecauseImAnEvilDevWhoDoesntCareAboutTheCommunityBooo(event); + renderTwintails(event); + else if(name.equals("_phi")) + renderPhiFlower(event); + else if(name.equals("haighyorkie")) + renderGoldfish(event); name = name.toLowerCase(); if(Minecraft.getMinecraft().gameSettings.getOptionOrdinalValue(Options.SHOW_CAPE) && flowerMap != null && flowerMap.containsKey(name)) @@ -76,8 +80,7 @@ public final class ContributorFancinessHandler { } } - - private static void renderFancyExclusiveDevStuffBecauseImAnEvilDevWhoDoesntCareAboutTheCommunityBooo(RenderPlayerEvent event) { + private static void renderTwintails(RenderPlayerEvent event) { GL11.glPushMatrix(); IIcon icon = ((ItemManaResource) ModItems.manaResource).tailIcon; float f = icon.getMinU(); @@ -107,6 +110,43 @@ public final class ContributorFancinessHandler { GL11.glPopMatrix(); } + private static void renderPhiFlower(RenderPlayerEvent event) { + GL11.glPushMatrix(); + IIcon icon = ((ItemManaResource) ModItems.manaResource).phiFlowerIcon; + float f = icon.getMinU(); + float f1 = icon.getMaxU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxV(); + Helper.translateToHeadLevel(event.entityPlayer); + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glRotatef(180F, 1F, 0F, 0F); + GL11.glTranslatef(-0.4F, 0.1F, -0.25F); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glScalef(0.4F, 0.4F, 0.4F); + GL11.glTranslatef(-1.2F, 0.2F, 0.2F); + GL11.glRotatef(20F, 1F, 0F, 0F); + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + GL11.glPopMatrix(); + } + + private static void renderGoldfish(RenderPlayerEvent event) { + GL11.glPushMatrix(); + IIcon icon = ((ItemManaResource) ModItems.manaResource).goldfishIcon; + float f = icon.getMinU(); + float f1 = icon.getMaxU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxV(); + Helper.rotateIfSneaking(event.entityPlayer); + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glRotatef(180F, 0F, 0F, 1F); + GL11.glTranslatef(-0.75F, 0.5F, 0F); + GL11.glScalef(0.4F, 0.4F, 0.4F); + GL11.glTranslatef(1.2F, 0.5F, 0F); + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + GL11.glPopMatrix(); + } + private static void renderFlower(RenderPlayerEvent event, IIcon icon) { GL11.glPushMatrix(); Helper.translateToHeadLevel(event.entityPlayer); 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 b49519f10..6854ab867 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -49,6 +49,8 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve IIcon[] icons; public IIcon tailIcon = null; + public IIcon phiFlowerIcon = null; + public IIcon goldfishIcon = null; public ItemManaResource() { super(); @@ -124,6 +126,8 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve icons[i] = IconHelper.forName(par1IconRegister, LibItemNames.MANA_RESOURCE_NAMES[i]); tailIcon = IconHelper.forName(par1IconRegister, "tail"); + phiFlowerIcon = IconHelper.forName(par1IconRegister, "phiFlower"); + goldfishIcon = IconHelper.forName(par1IconRegister, "goldfish"); } @Override diff --git a/src/main/resources/assets/botania/textures/items/goldfish.png b/src/main/resources/assets/botania/textures/items/goldfish.png new file mode 100644 index 0000000000000000000000000000000000000000..f49eddf24618439b62f2a1ee740df3669fca6169 GIT binary patch literal 18412 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/unused/cosmetic_phi.png b/src/main/resources/assets/botania/textures/items/phiFlower.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/cosmetic_phi.png rename to src/main/resources/assets/botania/textures/items/phiFlower.png diff --git a/web/changelog.txt b/web/changelog.txt index 6e05c7730..d8cc0b96b 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,5 @@ +r1.6 193 + r1.6 192 *Added the Spectral Rail. A new rail that makes carts fly. Woooosh~ *Changed the Spectranthemum to have a limited range and not be chainable. Use minecarts for long range yo.