From 0b28e37d2491108d4db5912edf81e4c68d71a876 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 03:38:14 +0000 Subject: [PATCH] Change Christmas period. --- .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 7 +++---- .../java/vazkii/botania/client/gui/lexicon/GuiLexicon.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) 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 28aad3046..75b068016 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -187,7 +187,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { - public static boolean singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = false; + public static boolean jingleTheBells = false; public static boolean dootDoot = false; @Override @@ -231,13 +231,12 @@ public class ClientProxy extends CommonProxy { if(ConfigHandler.enableSeasonalFeatures) { 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; + if((calendar.get(2) == 11 && calendar.get(5) >= 16) || (calendar.get(2) == 0 && calendar.get(5) <= 2)) + jingleTheBells = true; if(calendar.get(2) == 9) dootDoot = 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 c2e19b1d1..7d20632fb 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -206,7 +206,7 @@ public class GuiLexicon extends GuiScreen { mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left, top, 0, 0, guiWidth, guiHeight); - if(ClientProxy.singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle) + if(ClientProxy.jingleTheBells) drawTexturedModalRect(left + 3, top + 1, 0, 212, 138, 6); String subtitle = getSubtitle();