Code Clean Up (#2)

* intellij code clean up

* optimize imports

* format

* intellij suggestions

* fix empty catch issues

1 files changed, 382 insertions, 379 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index 3305cd13..2ed1e2fb 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -15,7 +15,6 @@ import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.client.shader.Shader;
 import net.minecraft.init.Items;
@@ -36,13 +35,13 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
-import static io.github.moulberry.notenoughupdates.util.GuiTextures.*;
-
 import java.io.File;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static io.github.moulberry.notenoughupdates.util.GuiTextures.help;
+
 public class CalendarOverlay {
 
     private static final ResourceLocation BACKGROUND = new ResourceLocation("notenoughupdates:calendar/background.png");
@@ -66,7 +65,7 @@ public class CalendarOverlay {
     private int xSize = 168;
     private int ySize = 170;
 
-    private class SBEvent {
+    private static class SBEvent {
         String id;
         String display;
         ItemStack stack;
@@ -88,7 +87,7 @@ public class CalendarOverlay {
 
     private int jingleIndex = -1;
 
-    private TreeMap<Long, Set<SBEvent>> eventMap = new TreeMap<>();
+    private final TreeMap<Long, Set<SBEvent>> eventMap = new TreeMap<>();
     private List<String> jfFavouriteSelect = null;
     private int jfFavouriteSelectIndex = 0;
     private int jfFavouriteSelectX = 0;
@@ -98,16 +97,17 @@ public class CalendarOverlay {
 
     private static long spookyStart = 0;
 
-    private static long SECOND = 1000;
-    private static long MINUTE = SECOND*60;
-    private static long HOUR = MINUTE*60;
-    private static long DAY = HOUR*24;
+    private static final long SECOND = 1000;
+    private static final long MINUTE = SECOND * 60;
+    private static final long HOUR = MINUTE * 60;
+    private static final long DAY = HOUR * 24;
 
-    private static long DA_OFFSET = 1000*60*55;
-    private static long JF_OFFSET = 1000*60*15;
+    private static final long DA_OFFSET = 1000 * 60 * 55;
+    private static final long JF_OFFSET = 1000 * 60 * 15;
+
+    private static final ItemStack DA_STACK;
+    private static final ItemStack JF_STACK;
 
-    private static ItemStack DA_STACK;
-    private static ItemStack JF_STACK;
     static {
         NBTTagCompound tag = new NBTTagCompound();
         tag.setString("event_id", "dark_auction");
@@ -125,25 +125,29 @@ public class CalendarOverlay {
         long offset = 0;
 
         StringBuilder numS = new StringBuilder();
-        for(int timeIndex=0; timeIndex<time.length(); timeIndex++) {
+        for (int timeIndex = 0; timeIndex < time.length(); timeIndex++) {
             char c = time.charAt(timeIndex);
 
-            if(c >= '0' && c <= '9') {
+            if (c >= '0' && c <= '9') {
                 numS.append(c);
             } else {
                 try {
                     int num = Integer.parseInt(numS.toString());
                     switch (c) {
                         case 'd':
-                            offset += num * DAY; continue;
+                            offset += num * DAY;
+                            continue;
                         case 'h':
-                            offset += num * HOUR; continue;
+                            offset += num * HOUR;
+                            continue;
                         case 'm':
-                            offset += num * MINUTE; continue;
+                            offset += num * MINUTE;
+                            continue;
                         case 's':
-                            offset += num * SECOND; continue;
+                            offset += num * SECOND;
+                            continue;
                     }
-                } catch(Exception ignored) {}
+                } catch (Exception ignored) {}
                 numS = new StringBuilder();
             }
         }
@@ -151,14 +155,14 @@ public class CalendarOverlay {
         return offset;
     }
 
-    private static Pattern CALENDAR_PATTERN = Pattern.compile("([A-Za-z ]+), Year ([0-9]+)");
-    private static long SKYBLOCK_START = 1559829300000L; //Day 0, Year 0
+    private static final Pattern CALENDAR_PATTERN = Pattern.compile("([A-Za-z ]+), Year ([0-9]+)");
+    private static final long SKYBLOCK_START = 1559829300000L; //Day 0, Year 0
 
     @SubscribeEvent
     public void tick(TickEvent.ClientTickEvent event) {
-        if(event.phase != TickEvent.Phase.START) return;
+        if (event.phase != TickEvent.Phase.START) return;
 
-        if(jingleIndex == 0) {
+        if (jingleIndex == 0) {
             if (NotEnoughUpdates.INSTANCE.config.calendar.eventNotificationSounds) {
                 Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(
                         new ResourceLocation("notenoughupdates:calendar_notif_jingle")
@@ -167,59 +171,59 @@ public class CalendarOverlay {
                         new ResourceLocation("notenoughupdates:calendar_notif_in")
                 ));
             }
-            jingleIndex = -15*20;
-        } else if(jingleIndex >= 1) {
+            jingleIndex = -15 * 20;
+        } else if (jingleIndex >= 1) {
             if (NotEnoughUpdates.INSTANCE.config.calendar.eventNotificationSounds) {
                 Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(
                         new ResourceLocation("notenoughupdates:calendar_notif_in")
                 ));
             }
-            jingleIndex = -15*20;
-        } else if(jingleIndex < -1) {
+            jingleIndex = -15 * 20;
+        } else if (jingleIndex < -1) {
             jingleIndex++;
         }
-        if(jingleIndex == -20*6-10) {
-            if(NotEnoughUpdates.INSTANCE.config.calendar.eventNotificationSounds) {
+        if (jingleIndex == -20 * 6 - 10) {
+            if (NotEnoughUpdates.INSTANCE.config.calendar.eventNotificationSounds) {
                 Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(
                         new ResourceLocation("notenoughupdates:calendar_notif_out")
                 ));
             }
         }
 
-        if(farmingEventTypes == null) {
+        if (farmingEventTypes == null) {
             farmingEventTypes = NotEnoughUpdates.INSTANCE.manager.getJsonFromFile(new File(NotEnoughUpdates.INSTANCE.manager.configLocation,
                     "farmingEventTypes.json"));
-            if(farmingEventTypes == null) {
+            if (farmingEventTypes == null) {
                 farmingEventTypes = new JsonObject();
             }
         }
 
-        if(!(Minecraft.getMinecraft().currentScreen instanceof GuiChest)) {
+        if (!(Minecraft.getMinecraft().currentScreen instanceof GuiChest)) {
             jfFavouriteSelect = null;
-            if(eventMap.isEmpty() || eventMap.size() <= 20) {
+            if (eventMap.isEmpty() || eventMap.size() <= 20) {
                 long currentTime = System.currentTimeMillis();
-                long floorHour = (currentTime/HOUR)*HOUR;
-                for(int i=0; i<15; i++) {
-                    long daEvent = floorHour+i*HOUR+DA_OFFSET;
-                    long jfEvent = floorHour+i*HOUR+JF_OFFSET;
-
-                    if(daEvent > currentTime) {
-                        eventMap.computeIfAbsent(daEvent, k->new HashSet<>()).add(new SBEvent("dark_auction",
-                                EnumChatFormatting.DARK_PURPLE+"Dark Auction", DA_STACK, null, MINUTE*5));
+                long floorHour = (currentTime / HOUR) * HOUR;
+                for (int i = 0; i < 15; i++) {
+                    long daEvent = floorHour + i * HOUR + DA_OFFSET;
+                    long jfEvent = floorHour + i * HOUR + JF_OFFSET;
+
+                    if (daEvent > currentTime) {
+                        eventMap.computeIfAbsent(daEvent, k -> new HashSet<>()).add(new SBEvent("dark_auction",
+                                EnumChatFormatting.DARK_PURPLE + "Dark Auction", DA_STACK, null, MINUTE * 5));
                     }
-                    if(jfEvent > currentTime) {
+                    if (jfEvent > currentTime) {
                         SBEvent jf = new SBEvent("jacob_farming",
-                                EnumChatFormatting.YELLOW+"Jacob's Farming Contest", JF_STACK, null, MINUTE*20);
-                        if(farmingEventTypes != null && farmingEventTypes.has(""+jfEvent) &&
-                                farmingEventTypes.get(""+jfEvent).isJsonArray()) {
-                            JsonArray arr =  farmingEventTypes.get(""+jfEvent).getAsJsonArray();
+                                EnumChatFormatting.YELLOW + "Jacob's Farming Contest", JF_STACK, null, MINUTE * 20);
+                        if (farmingEventTypes != null && farmingEventTypes.has("" + jfEvent) &&
+                                farmingEventTypes.get("" + jfEvent).isJsonArray()) {
+                            JsonArray arr = farmingEventTypes.get("" + jfEvent).getAsJsonArray();
                             jf.desc = new ArrayList<>();
-                            for(JsonElement e : arr) {
-                                jf.desc.add(EnumChatFormatting.YELLOW+"\u25CB "+e.getAsString());
+                            for (JsonElement e : arr) {
+                                jf.desc.add(EnumChatFormatting.YELLOW + "\u25CB " + e.getAsString());
                                 jf.id += ":" + e.getAsString();
                             }
                         }
-                        eventMap.computeIfAbsent(jfEvent, k->new HashSet<>()).add(jf);
+                        eventMap.computeIfAbsent(jfEvent, k -> new HashSet<>()).add(jf);
                     }
                 }
             }
@@ -231,7 +235,7 @@ public class CalendarOverlay {
         String containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
 
         Matcher matcher = CALENDAR_PATTERN.matcher(Utils.cleanColour(containerName));
-        if(farmingEventTypes != null && matcher.matches()) {
+        if (farmingEventTypes != null && matcher.matches()) {
             try {
                 int year = Integer.parseInt(matcher.group(2));
                 int skyblockDays = year * 12 * 31;
@@ -241,98 +245,98 @@ public class CalendarOverlay {
                 boolean summer = month.endsWith("Summer");
                 boolean autumn = month.endsWith("Autumn");
                 boolean winter = month.endsWith("Winter");
-                if(spring || summer || autumn || winter) {
-                    if(spring) {
-                        skyblockDays += 1*31;
-                    } else if(summer) {
-                        skyblockDays += 4*31;
-                    } else if(autumn) {
-                        skyblockDays += 7*31;
+                if (spring || summer || autumn || winter) {
+                    if (spring) {
+                        skyblockDays += 1 * 31;
+                    } else if (summer) {
+                        skyblockDays += 4 * 31;
+                    } else if (autumn) {
+                        skyblockDays += 7 * 31;
                     } else {
-                        skyblockDays += 10*31;
+                        skyblockDays += 10 * 31;
                     }
-                    if(month.startsWith("Early")) {
+                    if (month.startsWith("Early")) {
                         skyblockDays -= 31;
-                    } else if(month.startsWith("Late")) {
+                    } else if (month.startsWith("Late")) {
                         skyblockDays += 31;
                     }
 
-                    long start = SKYBLOCK_START + skyblockDays*20*MINUTE;
+                    long start = SKYBLOCK_START + skyblockDays * 20 * MINUTE;
 
                     boolean changed = false;
-                    for(int i=0; i<31; i++) {
-                        ItemStack item = cc.getLowerChestInventory().getStackInSlot(1+(i%7)+(i/7)*9);
+                    for (int i = 0; i < 31; i++) {
+                        ItemStack item = cc.getLowerChestInventory().getStackInSlot(1 + (i % 7) + (i / 7) * 9);
 
                         JsonArray array = new JsonArray();
-                        if(item.getTagCompound() != null) {
+                        if (item.getTagCompound() != null) {
                             NBTTagCompound tag = item.getTagCompound();
 
-                            if(tag.hasKey("display", 10)) {
+                            if (tag.hasKey("display", 10)) {
                                 NBTTagCompound display = tag.getCompoundTag("display");
                                 if (display.hasKey("Lore", 9)) {
                                     NBTTagList list = display.getTagList("Lore", 8);
-                                    for(int j=0; j<list.tagCount(); j++) {
+                                    for (int j = 0; j < list.tagCount(); j++) {
                                         String line = list.getStringTagAt(j);
-                                        if(line.startsWith(EnumChatFormatting.YELLOW+"\u25CB")) {
+                                        if (line.startsWith(EnumChatFormatting.YELLOW + "\u25CB")) {
                                             array.add(new JsonPrimitive(Utils.cleanColour(line.substring(4))));
                                         }
                                     }
                                 }
                             }
                         }
-                        if(array.size() == 3) {
-                            String prop = String.valueOf(start + i*20*MINUTE);
-                            if(!farmingEventTypes.has(prop) || !farmingEventTypes.get(prop).isJsonArray() ||
+                        if (array.size() == 3) {
+                            String prop = String.valueOf(start + i * 20 * MINUTE);
+                            if (!farmingEventTypes.has(prop) || !farmingEventTypes.get(prop).isJsonArray() ||
                                     farmingEventTypes.get(prop).getAsJsonArray().equals(array)) {
                                 changed = true;
                             }
                             farmingEventTypes.add(prop, array);
                         }
                     }
-                    if(changed) {
+                    if (changed) {
                         File f = new File(NotEnoughUpdates.INSTANCE.manager.configLocation,
                                 "farmingEventTypes.json");
                         NotEnoughUpdates.INSTANCE.manager.writeJson(farmingEventTypes, f);
                     }
                 }
-            } catch(Exception ignored) {
-                ignored.printStackTrace();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
 
-        if(!enabled) {
+        if (!enabled) {
             jfFavouriteSelect = null;
-            if(eventMap.isEmpty() || eventMap.size() <= 20) {
+            if (eventMap.isEmpty() || eventMap.size() <= 20) {
                 long currentTime = System.currentTimeMillis();
-                long floorHour = (currentTime/HOUR)*HOUR;
-                for(int i=0; i<15; i++) {
-                    long daEvent = floorHour+i*HOUR+DA_OFFSET;
-                    long jfEvent = floorHour+i*HOUR+JF_OFFSET;
-
-                    if(daEvent > currentTime) {
-                        eventMap.computeIfAbsent(daEvent, k->new HashSet<>()).add(new SBEvent("dark_auction",
-                                EnumChatFormatting.DARK_PURPLE+"Dark Auction", DA_STACK, null, MINUTE*5));
+                long floorHour = (currentTime / HOUR) * HOUR;
+                for (int i = 0; i < 15; i++) {
+                    long daEvent = floorHour + i * HOUR + DA_OFFSET;
+                    long jfEvent = floorHour + i * HOUR + JF_OFFSET;
+
+                    if (daEvent > currentTime) {
+                        eventMap.computeIfAbsent(daEvent, k -> new HashSet<>()).add(new SBEvent("dark_auction",
+                                EnumChatFormatting.DARK_PURPLE + "Dark Auction", DA_STACK, null, MINUTE * 5));
                     }
-                    if(jfEvent > currentTime) {
+                    if (jfEvent > currentTime) {
                         SBEvent jf = new SBEvent("jacob_farming",
-                                EnumChatFormatting.YELLOW+"Jacob's Farming Contest", JF_STACK, null, MINUTE*20);
-                        if(farmingEventTypes != null && farmingEventTypes.has(""+jfEvent) &&
-                                farmingEventTypes.get(""+jfEvent).isJsonArray()) {
-                            JsonArray arr =  farmingEventTypes.get(""+jfEvent).getAsJsonArray();
+                                EnumChatFormatting.YELLOW + "Jacob's Farming Contest", JF_STACK, null, MINUTE * 20);
+                        if (farmingEventTypes != null && farmingEventTypes.has("" + jfEvent) &&
+                                farmingEventTypes.get("" + jfEvent).isJsonArray()) {
+                            JsonArray arr = farmingEventTypes.get("" + jfEvent).getAsJsonArray();
                             jf.desc = new ArrayList<>();
-                            for(JsonElement e : arr) {
-                                jf.desc.add(EnumChatFormatting.YELLOW+"\u25CB "+e.getAsString());
+                            for (JsonElement e : arr) {
+                                jf.desc.add(EnumChatFormatting.YELLOW + "\u25CB " + e.getAsString());
                                 jf.id += ":" + e.getAsString();
                             }
                         }
-                        eventMap.computeIfAbsent(jfEvent, k->new HashSet<>()).add(jf);
+                        eventMap.computeIfAbsent(jfEvent, k -> new HashSet<>()).add(jf);
                     }
                 }
             }
             return;
         }
 
-        if(!containerName.trim().equals("Calendar and Events")) {
+        if (!containerName.trim().equals("Calendar and Events")) {
             setEnabled(false);
             return;
         }
@@ -340,47 +344,47 @@ public class CalendarOverlay {
         eventMap.clear();
 
         long currentTime = System.currentTimeMillis();
-        long floorHour = (currentTime/HOUR)*HOUR;
-        for(int i=0; i<15; i++) {
-            long daEvent = floorHour+i*HOUR+DA_OFFSET;
-            long jfEvent = floorHour+i*HOUR+JF_OFFSET;
-
-            if(daEvent > currentTime) {
-                eventMap.computeIfAbsent(daEvent, k->new HashSet<>()).add(new SBEvent("dark_auction",
-                        EnumChatFormatting.DARK_PURPLE+"Dark Auction", DA_STACK, null, MINUTE*5));
+        long floorHour = (currentTime / HOUR) * HOUR;
+        for (int i = 0; i < 15; i++) {
+            long daEvent = floorHour + i * HOUR + DA_OFFSET;
+            long jfEvent = floorHour + i * HOUR + JF_OFFSET;
+
+            if (daEvent > currentTime) {
+                eventMap.computeIfAbsent(daEvent, k -> new HashSet<>()).add(new SBEvent("dark_auction",
+                        EnumChatFormatting.DARK_PURPLE + "Dark Auction", DA_STACK, null, MINUTE * 5));
             }
-            if(jfEvent > currentTime) {
+            if (jfEvent > currentTime) {
                 SBEvent jf = new SBEvent("jacob_farming",
-                        EnumChatFormatting.YELLOW+"Jacob's Farming Contest", JF_STACK, null, MINUTE*20);
-                if(farmingEventTypes != null && farmingEventTypes.has(""+jfEvent) &&
-                        farmingEventTypes.get(""+jfEvent).isJsonArray()) {
-                    JsonArray arr =  farmingEventTypes.get(""+jfEvent).getAsJsonArray();
+                        EnumChatFormatting.YELLOW + "Jacob's Farming Contest", JF_STACK, null, MINUTE * 20);
+                if (farmingEventTypes != null && farmingEventTypes.has("" + jfEvent) &&
+                        farmingEventTypes.get("" + jfEvent).isJsonArray()) {
+                    JsonArray arr = farmingEventTypes.get("" + jfEvent).getAsJsonArray();
                     jf.desc = new ArrayList<>();
-                    for(JsonElement e : arr) {
-                        jf.desc.add(EnumChatFormatting.YELLOW+"\u25CB "+e.getAsString());
+                    for (JsonElement e : arr) {
+                        jf.desc.add(EnumChatFormatting.YELLOW + "\u25CB " + e.getAsString());
                         jf.id += ":" + e.getAsString();
                     }
                 }
-                eventMap.computeIfAbsent(jfEvent, k->new HashSet<>()).add(jf);
+                eventMap.computeIfAbsent(jfEvent, k -> new HashSet<>()).add(jf);
             }
         }
 
-        String lastsForText = EnumChatFormatting.GRAY+"Event lasts for "+EnumChatFormatting.YELLOW;
-        String startsInText = EnumChatFormatting.GRAY+"Starts in: "+EnumChatFormatting.YELLOW;
-        for(int i=0; i<21; i++) {
-            int itemIndex = 10+i+(i/7)*2;
+        String lastsForText = EnumChatFormatting.GRAY + "Event lasts for " + EnumChatFormatting.YELLOW;
+        String startsInText = EnumChatFormatting.GRAY + "Starts in: " + EnumChatFormatting.YELLOW;
+        for (int i = 0; i < 21; i++) {
+            int itemIndex = 10 + i + (i / 7) * 2;
             ItemStack item = cc.getLowerChestInventory().getStackInSlot(itemIndex);
 
-            if(item != null && item.getTagCompound() != null) {
+            if (item != null && item.getTagCompound() != null) {
                 NBTTagCompound tag = item.getTagCompound();
 
-                if(tag.hasKey("display", 10)) {
+                if (tag.hasKey("display", 10)) {
                     NBTTagCompound display = tag.getCompoundTag("display");
                     if (display.hasKey("Lore", 9)) {
                         NBTTagList list = display.getTagList("Lore", 8);
 
                         String first = list.getStringTagAt(0);
-                        if(first.startsWith(startsInText)) {
+                        if (first.startsWith(startsInText)) {
                             String time = Utils.cleanColour(first.substring(startsInText.length()));
                             long eventTime = currentTime + getTimeOffset(time);
 
@@ -388,21 +392,21 @@ public class CalendarOverlay {
 
                             List<String> desc = new ArrayList<>();
                             boolean foundBreak = false;
-                            for(int index=1; index<list.tagCount(); index++) {
+                            for (int index = 1; index < list.tagCount(); index++) {
                                 String line = list.getStringTagAt(index);
-                                if(foundBreak) {
+                                if (foundBreak) {
                                     desc.add(line);
                                 } else {
-                                    if(line.startsWith(lastsForText)) {
+                                    if (line.startsWith(lastsForText)) {
                                         String lastsForS = Utils.cleanColour(line.substring(lastsForText.length()));
                                         lastsFor = getTimeOffset(lastsForS);
                                     }
-                                    if(Utils.cleanColour(line).trim().length() == 0) {
+                                    if (Utils.cleanColour(line).trim().length() == 0) {
                                         foundBreak = true;
                                     }
                                 }
                             }
-                            eventMap.computeIfAbsent(eventTime, k->new HashSet<>()).add(new SBEvent(
+                            eventMap.computeIfAbsent(eventTime, k -> new HashSet<>()).add(new SBEvent(
                                     getIdForDisplayName(item.getDisplayName()), item.getDisplayName(),
                                     item, desc, lastsFor));
                         }
@@ -424,7 +428,6 @@ public class CalendarOverlay {
                 .replace(" ", "_");
     }
 
-
     @SubscribeEvent
     public void onGuiScreenMouse(GuiScreenEvent.MouseInputEvent.Pre event) {
         ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
@@ -433,17 +436,17 @@ public class CalendarOverlay {
         int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
         int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
 
-        if(!enabled) {
-            if(Mouse.getEventButtonState() && NotEnoughUpdates.INSTANCE.config.calendar.showEventTimerInInventory &&
+        if (!enabled) {
+            if (Mouse.getEventButtonState() && NotEnoughUpdates.INSTANCE.config.calendar.showEventTimerInInventory &&
                     Minecraft.getMinecraft().currentScreen instanceof GuiContainer) {
                 xSize = 168;
                 ySize = 20;
 
-                guiLeft = (width - xSize)/2;
+                guiLeft = (width - xSize) / 2;
                 guiTop = 5;
 
-                if(mouseX >= guiLeft && mouseX <= guiLeft+xSize) {
-                    if(mouseY >= guiTop && mouseY <= guiTop+ySize) {
+                if (mouseX >= guiLeft && mouseX <= guiLeft + xSize) {
+                    if (mouseY >= guiTop && mouseY <= guiTop + ySize) {
                         ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/neucalendar");
                     }
                 }
@@ -452,14 +455,14 @@ public class CalendarOverlay {
             return;
         }
 
-        if(!(Minecraft.getMinecraft().currentScreen instanceof GuiChest)) {
+        if (!(Minecraft.getMinecraft().currentScreen instanceof GuiChest)) {
             return;
         }
 
         GuiChest eventGui = (GuiChest) Minecraft.getMinecraft().currentScreen;
         ContainerChest cc = (ContainerChest) eventGui.inventorySlots;
         String containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
-        if(!containerName.trim().equals("Calendar and Events")) {
+        if (!containerName.trim().equals("Calendar and Events")) {
             setEnabled(false);
             return;
         }
@@ -471,8 +474,8 @@ public class CalendarOverlay {
         guiLeft = (width - xSize) / 2;
         guiTop = (height - ySize) / 2;
 
-        if(Mouse.getEventButtonState()) {
-            if(jfFavouriteSelect != null) {
+        if (Mouse.getEventButtonState()) {
+            if (jfFavouriteSelect != null) {
                 FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
                 int arrowLen = fr.getStringWidth("> ");
                 int selectSizeX = 0;
@@ -487,18 +490,18 @@ public class CalendarOverlay {
                 }
                 selectSizeX += +10;
 
-                if(mouseX > jfFavouriteSelectX && mouseX < jfFavouriteSelectX + selectSizeX &&
-                    mouseY > jfFavouriteSelectY && mouseY < jfFavouriteSelectY + 18 + jfFavouriteSelect.size() * 10) {
-                    jfFavouriteSelectIndex = Math.max(0, (mouseY - jfFavouriteSelectY - 5)/10);
+                if (mouseX > jfFavouriteSelectX && mouseX < jfFavouriteSelectX + selectSizeX &&
+                        mouseY > jfFavouriteSelectY && mouseY < jfFavouriteSelectY + 18 + jfFavouriteSelect.size() * 10) {
+                    jfFavouriteSelectIndex = Math.max(0, (mouseY - jfFavouriteSelectY - 5) / 10);
 
                     List<String> eventFavourites = NotEnoughUpdates.INSTANCE.config.hidden.eventFavourites;
                     String id = null;
-                    if(jfFavouriteSelectIndex == 0) {
+                    if (jfFavouriteSelectIndex == 0) {
                         id = "jacob_farming";
-                    } else if(jfFavouriteSelectIndex-1 < jfFavouriteSelect.size()) {
-                        id = "jacob_farming:"+jfFavouriteSelect.get(jfFavouriteSelectIndex-1);
+                    } else if (jfFavouriteSelectIndex - 1 < jfFavouriteSelect.size()) {
+                        id = "jacob_farming:" + jfFavouriteSelect.get(jfFavouriteSelectIndex - 1);
                     }
-                    if(id != null) {
+                    if (id != null) {
                         if (eventFavourites.contains(id)) {
                             eventFavourites.remove(id);
                         } else {
@@ -509,9 +512,9 @@ public class CalendarOverlay {
                     jfFavouriteSelect = null;
                 }
             }
-            if(mouseY >= guiTop+26 && mouseY <= guiTop+26+141) {
-                if(mouseX >= guiLeft+151 && mouseX <= guiLeft+151+14) {
-                    if(mouseY <= guiTop+26+70) {
+            if (mouseY >= guiTop + 26 && mouseY <= guiTop + 26 + 141) {
+                if (mouseX >= guiLeft + 151 && mouseX <= guiLeft + 151 + 14) {
+                    if (mouseY <= guiTop + 26 + 70) {
                         Minecraft.getMinecraft().playerController.windowClick(cc.windowId,
                                 50, 2, 3, Minecraft.getMinecraft().thePlayer);
                     } else {
@@ -525,8 +528,8 @@ public class CalendarOverlay {
 
     @SubscribeEvent
     public void onGuiScreenKeyboard(GuiScreenEvent.KeyboardInputEvent.Pre event) {
-        if(Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
-            if(jfFavouriteSelect != null) {
+        if (Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
+            if (jfFavouriteSelect != null) {
                 jfFavouriteSelect = null;
                 event.setCanceled(true);
             }
@@ -560,34 +563,34 @@ public class CalendarOverlay {
             guiTop = (height - ySize) / 2;
 
             int keyPressed = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey();
-            if(Keyboard.getEventKeyState()) {
-                if(jfFavouriteSelect != null) {
-                    if(keyPressed == Keyboard.KEY_DOWN) {
+            if (Keyboard.getEventKeyState()) {
+                if (jfFavouriteSelect != null) {
+                    if (keyPressed == Keyboard.KEY_DOWN) {
                         jfFavouriteSelectIndex++;
-                        jfFavouriteSelectIndex %= jfFavouriteSelect.size()+1;
-                    } else if(keyPressed == Keyboard.KEY_UP) {
+                        jfFavouriteSelectIndex %= jfFavouriteSelect.size() + 1;
+                    } else if (keyPressed == Keyboard.KEY_UP) {
                         jfFavouriteSelectIndex--;
-                        if(jfFavouriteSelectIndex < 0) jfFavouriteSelectIndex = jfFavouriteSelect.size();
-                    } else if(keyPressed == Keyboard.KEY_RIGHT || keyPressed == Keyboard.KEY_RETURN) {
+                        if (jfFavouriteSelectIndex < 0) jfFavouriteSelectIndex = jfFavouriteSelect.size();
+                    } else if (keyPressed == Keyboard.KEY_RIGHT || keyPressed == Keyboard.KEY_RETURN) {
                         List<String> eventFavourites = NotEnoughUpdates.INSTANCE.config.hidden.eventFavourites;
                         String id = null;
-                        if(jfFavouriteSelectIndex == 0) {
+                        if (jfFavouriteSelectIndex == 0) {
                             id = "jacob_farming";
-                        } else if(jfFavouriteSelectIndex-1 < jfFavouriteSelect.size()) {
-                            id = "jacob_farming:"+jfFavouriteSelect.get(jfFavouriteSelectIndex-1);
+                        } else if (jfFavouriteSelectIndex - 1 < jfFavouriteSelect.size()) {
+                            id = "jacob_farming:" + jfFavouriteSelect.get(jfFavouriteSelectIndex - 1);
                         }
-                        if(id != null) {
+                        if (id != null) {
                             if (eventFavourites.contains(id)) {
                                 eventFavourites.remove(id);
                             } else {
                                 eventFavourites.add(id);
                             }
                         }
-                    } else if(keyPressed == Keyboard.KEY_LEFT ||
+                    } else if (keyPressed == Keyboard.KEY_LEFT ||
                             keyPressed == NotEnoughUpdates.INSTANCE.manager.keybindFavourite.getKeyCode()) {
                         jfFavouriteSelect = null;
                     }
-                } else if(keyPressed == NotEnoughUpdates.INSTANCE.manager.keybindFavourite.getKeyCode()) {
+                } else if (keyPressed == NotEnoughUpdates.INSTANCE.manager.keybindFavourite.getKeyCode()) {
                     String id = null;
 
                     //Daily Events
@@ -626,9 +629,9 @@ public class CalendarOverlay {
 
                     if (id != null) {
                         String[] split = id.split(":");
-                        if(split.length > 1 && split[0].equals("jacob_farming")) {
+                        if (split.length > 1 && split[0].equals("jacob_farming")) {
                             jfFavouriteSelect = new ArrayList<>();
-                            for(int i=1; i<split.length; i++) {
+                            for (int i = 1; i < split.length; i++) {
                                 jfFavouriteSelect.add(split[i]);
                             }
                             jfFavouriteSelectIndex = 0;
@@ -650,11 +653,11 @@ public class CalendarOverlay {
 
     @SubscribeEvent(priority = EventPriority.LOW)
     public void onGuiDraw(RenderGameOverlayEvent.Post event) {
-        if(NotEnoughUpdates.INSTANCE.config.calendar.eventNotifications &&
+        if (NotEnoughUpdates.INSTANCE.config.calendar.eventNotifications &&
                 event.type == RenderGameOverlayEvent.ElementType.ALL) {
             GlStateManager.pushMatrix();
             GlStateManager.translate(0, 0, 10);
-            if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer) && NotEnoughUpdates.INSTANCE.isOnSkyblock()) {
+            if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer) && NotEnoughUpdates.INSTANCE.isOnSkyblock()) {
                 long currentTime = System.currentTimeMillis();
 
                 long timeUntilNext = 0;
@@ -666,28 +669,28 @@ public class CalendarOverlay {
 
                 //Daily Events
                 out:
-                for(Map.Entry<Long, Set<SBEvent>> sbEvents : eventMap.entrySet()) {
-                    for(SBEvent sbEvent : sbEvents.getValue()) {
+                for (Map.Entry<Long, Set<SBEvent>> sbEvents : eventMap.entrySet()) {
+                    for (SBEvent sbEvent : sbEvents.getValue()) {
                         long timeUntilMillis = sbEvents.getKey() - currentTime;
 
-                        if(timeUntilMillis < -10*SECOND) {
+                        if (timeUntilMillis < -10 * SECOND) {
                             continue;
                         }
 
-                        if(firstEvent == null) {
+                        if (firstEvent == null) {
                             firstEvent = sbEvent;
                             timeUntilFirst = timeUntilMillis;
                         }
 
                         String[] split = sbEvent.id.split(":");
                         boolean containsId = false;
-                        for(int i=1; i<split.length; i++) {
-                            if(eventFavourites.contains(split[0]+":"+split[i])) {
+                        for (int i = 1; i < split.length; i++) {
+                            if (eventFavourites.contains(split[0] + ":" + split[i])) {
                                 containsId = true;
                                 break;
                             }
                         }
-                        if(eventFavourites.isEmpty() || eventFavourites.contains(split[0]) || containsId) {
+                        if (eventFavourites.isEmpty() || eventFavourites.contains(split[0]) || containsId) {
                             nextEvent = sbEvent;
                             timeUntilNext = timeUntilMillis;
                             break out;
@@ -695,7 +698,7 @@ public class CalendarOverlay {
                     }
                 }
 
-                if(nextEvent != null) {
+                if (nextEvent != null) {
                     renderToast(nextEvent, timeUntilNext);
                 }
             }
@@ -705,22 +708,22 @@ public class CalendarOverlay {
     }
 
     public boolean renderToast(SBEvent event, long timeUntil) {
-        if(!NotEnoughUpdates.INSTANCE.config.calendar.eventNotifications) {
+        if (!NotEnoughUpdates.INSTANCE.config.calendar.eventNotifications) {
             return false;
         }
 
         long currentTime = System.currentTimeMillis();
-        if(currentTime - spookyStart > 0 && currentTime - spookyStart < HOUR &&
+        if (currentTime - spookyStart > 0 && currentTime - spookyStart < HOUR &&
                 NotEnoughUpdates.INSTANCE.config.calendar.spookyNightNotification) {
-            long delta = (currentTime - SKYBLOCK_START) % (20*MINUTE) - 19*50*SECOND - 10*SECOND;
-            if(delta < 500 && delta > -8500) {
+            long delta = (currentTime - SKYBLOCK_START) % (20 * MINUTE) - 19 * 50 * SECOND - 10 * SECOND;
+            if (delta < 500 && delta > -8500) {
                 event = new SBEvent("spooky_festival_7pm", "Spooky Festival 7pm", new ItemStack(Items.bone), null);
                 timeUntil = delta;
             }
         }
 
-        if(event.id.equals("dark_auction")) {
-            timeUntil -= 30*1000;
+        if (event.id.equals("dark_auction")) {
+            timeUntil -= 30 * 1000;
         }
 
         FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
@@ -730,20 +733,20 @@ public class CalendarOverlay {
 
         int ySize = 32;
         int xSize = 160;
-        int guiLeft = (width - xSize)/2;
+        int guiLeft = (width - xSize) / 2;
         int guiTop = 5;
 
         boolean preNotification = false;
-        long preNotificationTime = SECOND*NotEnoughUpdates.INSTANCE.config.calendar.startingSoonTime;
+        long preNotificationTime = SECOND * NotEnoughUpdates.INSTANCE.config.calendar.startingSoonTime;
 
-        if(preNotificationTime > 500 && timeUntil > 500) {
+        if (preNotificationTime > 500 && timeUntil > 500) {
             timeUntil = timeUntil - preNotificationTime;
             preNotification = true;
         }
 
-        if(timeUntil < 500 && timeUntil > -8500) {
-            if(jingleIndex == -1) {
-                if(preNotification) {
+