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 95e4ee642..4fe06fa86 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -13,6 +13,7 @@ package vazkii.botania.client.core.proxy; import java.awt.Desktop; import java.net.URI; +import java.util.Calendar; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -115,6 +116,8 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { + public static boolean singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = false; + @Override public void init(FMLInitializationEvent event) { super.init(event); @@ -131,6 +134,12 @@ public class ClientProxy extends CommonProxy { if(ConfigHandler.versionCheckEnabled) new VersionChecker().init(); + + // Jingle bells jingle bells + Calendar calendar = Calendar.getInstance(); + if((calendar.get(2) == 11 && calendar.get(5) >= 24 && calendar.get(5) <= 26) || (calendar.get(2) == 0 && calendar.get(5) <= 6)) + singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = true; + initRenderers(); } 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 54d7d1cd6..89e548ad4 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -31,6 +31,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.gui.lexicon.button.GuiButtonBookmark; import vazkii.botania.client.gui.lexicon.button.GuiButtonCategory; import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; @@ -109,6 +110,10 @@ public class GuiLexicon extends GuiScreen { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left, top, 0, 0, guiWidth, guiHeight); + + if(ClientProxy.singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle) + drawTexturedModalRect(left + 3, top + 1, 0, 212, 138, 6); + drawBookmark(left + guiWidth / 2, top - getTitleHeight(), getTitle(), true); String subtitle = getSubtitle(); if(subtitle != null) { @@ -123,7 +128,7 @@ public class GuiLexicon extends GuiScreen { populateBookmarks(); bookmarksNeedPopulation = false; } - + if(mc.thePlayer.getCommandSenderName().equals("haighyorkie")) { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); diff --git a/src/main/resources/assets/botania/textures/gui/lexicon.png b/src/main/resources/assets/botania/textures/gui/lexicon.png index 4787609fc..8b7a26b5b 100644 Binary files a/src/main/resources/assets/botania/textures/gui/lexicon.png and b/src/main/resources/assets/botania/textures/gui/lexicon.png differ