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 000000000..f49eddf24 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/goldfish.png differ 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.