diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index bf9c5d353..77a094cd0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -66,8 +66,8 @@ public final class BaubleRenderHandler { ItemStack helm = player.inventory.armorItemInSlot(3); if(helm != null && helm.getItem() instanceof ItemTerrasteelHelm) ItemTerrasteelHelm.renderOnPlayer(helm, event); - //if(event.entityPlayer.getCommandSenderName().equals("Vazkii")) - //renderFancyExclusiveDevStuffBecauseImAnEvilDevWhoDoesntCareAboutTheCommunityBooo(event); + if(event.entityPlayer.getCommandSenderName().equals("Vazkii")) + renderFancyExclusiveDevStuffBecauseImAnEvilDevWhoDoesntCareAboutTheCommunityBooo(event); GL11.glPopMatrix(); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 744b466ad..da38aabf7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Queue; import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -47,6 +48,7 @@ public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); public static ItemStack stackUsed; + private static final int[] KONAMI_CODE = { 200, 200, 208, 208, 203, 205, 203, 205, 48, 30 }; public static final int BOOKMARK_START = 1337; public static List bookmarks = new ArrayList(); boolean bookmarksNeedPopulation = false; @@ -64,7 +66,8 @@ public class GuiLexicon extends GuiScreen { private static final int TUTORIAL_ARROW_HEIGHT = 12; boolean hasTutorialArrow; int tutorialArrowX, tutorialArrowY; - + int konamiIndex; + List allCategories; String title; @@ -381,7 +384,16 @@ public class GuiLexicon extends GuiScreen { mc.displayGuiScreen(null); mc.setIngameFocus(); } - + + System.out.println(par2); + if(par2 == KONAMI_CODE[konamiIndex]) { + konamiIndex++; + if(konamiIndex >= KONAMI_CODE.length) { + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147673_a(new ResourceLocation("botania:way"))); + konamiIndex = 0; + } + } else konamiIndex = 0; + super.keyTyped(par1, par2); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index aaf20c61c..c8b394451 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -135,6 +135,12 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { mc.renderEngine.bindTexture(texture); GL11.glColor4f(1F, 1F, 1F, 1F); drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12); + } else { + boolean unicode = mc.fontRenderer.getUnicodeFlag(); + mc.fontRenderer.setUnicodeFlag(true); + String s = StatCollector.translateToLocal("botaniamisc.typeToSearch"); + mc.fontRenderer.drawString(s, left + 120 - mc.fontRenderer.getStringWidth(s), top + guiHeight - 18, 0x666666); + mc.fontRenderer.setUnicodeFlag(unicode); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 8e4e0cdb2..36f1f60c1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -60,7 +61,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private static final int COST = 35; public static IIcon[] wingIcons; - private static final int WING_TYPES = 7; + private static final int SUBTYPES = 7; + private static final int WING_TYPES = 8; public ItemFlightTiara() { super(LibItemNames.FLIGHT_TIARA); @@ -85,7 +87,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < WING_TYPES + 1; i++) + for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } @@ -94,6 +96,15 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub par3List.add(StatCollector.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); } + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + super.onWornTick(stack, player); + if(stack.getItemDamage() != 8 && stack.getDisplayName().hashCode() == 0x7867EB0B) { + stack.setItemDamage(8); + stack.getTagCompound().removeTag("display"); + } + } + @SubscribeEvent public void updatePlayerFlyStatus(LivingUpdateEvent event) { if(event.entityLiving instanceof EntityPlayer) { @@ -150,6 +161,12 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub r = 0.2F; g = 0.6F; b = 0.2F; + break; + } + case 8 : { + r = 0F; + b = 0F; + break; } } @@ -216,6 +233,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1F, 1F, 1F, 1F); + int light = 15728880; + int lightmapX = light % 65536; + int lightmapY = light / 65536; switch(meta) { case 1 : { // Jibril h = 0.4F; @@ -233,9 +253,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub break; } case 4 : { // Fire - int light = 15728880; - int lightmapX = light % 65536; - int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); break; } @@ -259,6 +276,14 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GL11.glColor4f(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.2F); break; } + case 8 : { // The One + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); + rz = 180F; + rx = 0F; + s = 1.5F; + h = 1.2F; + GL11.glColor4f(1F, 1F, 1F, 0.5F + (flying ? ((float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.25F) + 0.25F : 0F)); + } } float f = icon.getMinU(); @@ -334,5 +359,4 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub return stack.getItemDamage() == 1 ? ModAchievements.tiaraWings : null; } - } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c63aac108..48786ffb7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -85,6 +85,7 @@ botaniamisc.tutorialStarted=You have started your tutorial, follow the red arrow botaniamisc.tutorialEnded=Your tutorial is over, you should now have a basic idea of how Botania works, make sure to read through the other pages at your leisure to learn more ways of using the mod. botaniamisc.cosmeticBauble=&oCosmetic botaniamisc.hasCosmetic=&oHas Cosmetic Override: &r%s +botaniamisc.typeToSearch=(type to search) # NEI INTEGRATION botania.nei.brewery=Botanical Brewery @@ -138,6 +139,7 @@ botania.wings4=Wings: Firelord botania.wings5=Wings: Black Snow Princess botania.wings6=Wings: Lord of the Pit botania.wings7=Wings: Sylph +botania.wings8=Wings: The One # ARMOR SETS botania.armorset.manasteel.name=Mana Affinity diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index c497ff503..971fca547 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -1,34 +1,35 @@ { - "airRod": { "category": "neutral", "sounds":["airRod"] }, - "agricarnation": { "category": "neutral", "sounds":["agricarnation"] }, - "altarCraft": { "category": "neutral", "sounds":["altarCraft"] }, - "bifrostRod": { "category": "neutral", "sounds":["bifrostRod"] }, - "blackLotus": { "category": "neutral", "sounds":["blackLotus"] }, - "ding": { "category": "neutral", "sounds":["ding"] }, - "divaCharm": { "category": "neutral", "sounds":["divaCharm"] }, - "divinationRod": { "category": "neutral", "sounds":["divinationRod"] }, - "enchanterBlock": { "category": "neutral", "sounds":["enchanterBlock"] }, - "enchanterEnchant": { "category": "neutral", "sounds":["enchanterEnchant"] }, - "endoflame": { "category": "neutral", "sounds":["endoflame"] }, - "equipBauble": { "category": "neutral", "sounds":["equipBauble"] }, - "gaiaTrap": { "category": "neutral", "sounds":["gaiaTrap"] }, - "goldenLaurel": { "category": "neutral", "sounds":["goldenLaurel"] }, - "holyCloak": { "category": "neutral", "sounds":["holyCloak"] }, - "laputaStart": { "category": "neutral", "sounds":["laputaStart"] }, - "lexiconOpen": { "category": "neutral", "sounds":["lexiconOpen"] }, - "lexiconPage": { "category": "neutral", "sounds":["lexiconPage"] }, - "manaBlaster": { "category": "neutral", "sounds":["manaBlaster"] }, - "manaPoolCraft": { "category": "neutral", "sounds":["manaPoolCraft"] }, - "missile": { "category": "neutral", "sounds":["missile"] }, - "orechid": { "category": "neutral", "sounds":["orechid"] }, - "potionCreate": { "category": "neutral", "sounds":["potionCreate"] }, - "runeAltarCraft": { "category": "neutral", "sounds":["runeAltarCraft"] }, - "runeAltarStart": { "category": "neutral", "sounds":["runeAltarStart"] }, - "spreaderFire": { "category": "neutral", "sounds":["spreaderFire"] }, - "terraBlade": { "category": "neutral", "sounds":["terraBlade"] }, - "terraformRod": { "category": "neutral", "sounds":["terraformRod"] }, - "terraPickMode": { "category": "neutral", "sounds":["terraPickMode"] }, - "terrasteelCraft": { "category": "neutral", "sounds":["terrasteelCraft"] }, - "thermalily": { "category": "neutral", "sounds":["thermalily"] }, - "unholyCloak": { "category": "neutral", "sounds":["unholyCloak"] } + "airRod": { "category": "player", "sounds":["airRod"] }, + "agricarnation": { "category": "block", "sounds":["agricarnation"] }, + "altarCraft": { "category": "block", "sounds":["altarCraft"] }, + "bifrostRod": { "category": "player", "sounds":["bifrostRod"] }, + "blackLotus": { "category": "block", "sounds":["blackLotus"] }, + "ding": { "category": "block", "sounds":["ding"] }, + "divaCharm": { "category": "player", "sounds":["divaCharm"] }, + "divinationRod": { "category": "player", "sounds":["divinationRod"] }, + "enchanterBlock": { "category": "block", "sounds":["enchanterBlock"] }, + "enchanterEnchant": { "category": "block", "sounds":["enchanterEnchant"] }, + "endoflame": { "category": "block", "sounds":["endoflame"] }, + "equipBauble": { "category": "player", "sounds":["equipBauble"] }, + "gaiaTrap": { "category": "hostile", "sounds":["gaiaTrap"] }, + "goldenLaurel": { "category": "player", "sounds":["goldenLaurel"] }, + "holyCloak": { "category": "player", "sounds":["holyCloak"] }, + "laputaStart": { "category": "player", "sounds":["laputaStart"] }, + "lexiconOpen": { "category": "master", "sounds":["lexiconOpen"] }, + "lexiconPage": { "category": "master", "sounds":["lexiconPage"] }, + "manaBlaster": { "category": "player", "sounds":["manaBlaster"] }, + "manaPoolCraft": { "category": "block", "sounds":["manaPoolCraft"] }, + "missile": { "category": "player", "sounds":["missile"] }, + "orechid": { "category": "block", "sounds":["orechid"] }, + "potionCreate": { "category": "block", "sounds":["potionCreate"] }, + "runeAltarCraft": { "category": "block", "sounds":["runeAltarCraft"] }, + "runeAltarStart": { "category": "block", "sounds":["runeAltarStart"] }, + "spreaderFire": { "category": "block", "sounds":["spreaderFire"] }, + "terraBlade": { "category": "player", "sounds":["terraBlade"] }, + "terraformRod": { "category": "player", "sounds":["terraformRod"] }, + "terraPickMode": { "category": "player", "sounds":["terraPickMode"] }, + "terrasteelCraft": { "category": "block", "sounds":["terrasteelCraft"] }, + "thermalily": { "category": "block", "sounds":["thermalily"] }, + "unholyCloak": { "category": "player", "sounds":["unholyCloak"] }, + "way": { "category": "master", "sounds":["way"] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/sounds/way.ogg b/src/main/resources/assets/botania/sounds/way.ogg new file mode 100644 index 000000000..045dd7059 Binary files /dev/null and b/src/main/resources/assets/botania/sounds/way.ogg differ diff --git a/src/main/resources/assets/botania/textures/items/flightTiara8.png b/src/main/resources/assets/botania/textures/items/flightTiara8.png new file mode 100644 index 000000000..561591ae9 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/flightTiara8.png differ diff --git a/src/main/resources/assets/botania/textures/items/flightTiara8.png.mcmeta b/src/main/resources/assets/botania/textures/items/flightTiara8.png.mcmeta new file mode 100644 index 000000000..349719fd5 --- /dev/null +++ b/src/main/resources/assets/botania/textures/items/flightTiara8.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation":{ + "width":60, + "height":60, + "frametime":4 + } +} \ No newline at end of file