Merge branch 'development' into InstallerFrame

# Conflicts:
#	build.gradle

70 files changed, 6896 insertions, 5306 deletions

diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 12a8066..0920520 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -1,52 +1,43 @@
 package me.Danker;
 
-import com.google.gson.JsonObject;
 import me.Danker.commands.*;
+import me.Danker.events.ChestSlotClickedEvent;
+import me.Danker.events.GuiChestBackgroundDrawnEvent;
+import me.Danker.events.RenderOverlay;
+import me.Danker.features.*;
+import me.Danker.features.loot.LootDisplay;
+import me.Danker.features.loot.LootTracker;
+import me.Danker.features.puzzlesolvers.*;
 import me.Danker.gui.*;
-import me.Danker.handlers.*;
-import me.Danker.utils.TicTacToeUtils;
+import me.Danker.handlers.ConfigHandler;
+import me.Danker.handlers.PacketHandler;
 import me.Danker.utils.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.*;
+import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.inventory.GuiChest;
-import net.minecraft.client.settings.GameSettings;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.command.ICommand;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityArmorStand;
-import net.minecraft.entity.item.EntityItemFrame;
-import net.minecraft.entity.monster.EntityCreeper;
-import net.minecraft.entity.monster.EntitySpider;
-import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.entity.passive.EntityWolf;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.event.ClickEvent.Action;
 import net.minecraft.event.HoverEvent;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.ContainerChest;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemMap;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.*;
-import net.minecraft.world.World;
-import net.minecraft.world.storage.MapData;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.StringUtils;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.client.GuiIngameForge;
-import net.minecraftforge.client.event.*;
-import net.minecraftforge.client.event.sound.PlaySoundEvent;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.client.event.GuiScreenEvent;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
-import net.minecraftforge.event.entity.player.*;
-import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
@@ -54,115 +45,31 @@ import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
 import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent;
-import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
-import org.apache.commons.lang3.time.StopWatch;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
 
-import java.awt.*;
-import java.text.NumberFormat;
 import java.util.List;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.Map;
 
 @Mod(modid = DankersSkyblockMod.MODID, version = DankersSkyblockMod.VERSION, clientSideOnly = true)
 public class DankersSkyblockMod {
     public static final String MODID = "Danker's Skyblock Mod";
-    public static final String VERSION = "1.8.5";
-    static double checkItemsNow = 0;
-    static double itemsChecked = 0;
-    public static Map<String, String> t6Enchants = new HashMap<>();
-    public static Pattern t6EnchantPattern = Pattern.compile("");
-    static Pattern petPattern = Pattern.compile("\\[Lvl [\\d]{1,3}]");
-    static boolean updateChecked = false;
+    public static final String VERSION = "1.8.6-beta1";
     public static int titleTimer = -1;
     public static boolean showTitle = false;
     public static String titleText = "";
-    public static int SKILL_TIME;
-    public static int skillTimer = -1;
-    public static boolean showSkill = false;
-    public static String skillText = "";
-    static int tickAmount = 1;
-    static String lastMaddoxCommand = "/cb placeholder";
-    static double lastMaddoxTime = 0;
-    static KeyBinding[] keyBindings = new KeyBinding[3];
-    static boolean usingLabymod = false;
-    static boolean usingOAM = false;
+    public static int tickAmount = 1;
+    public static KeyBinding[] keyBindings = new KeyBinding[3];
+    public static boolean usingLabymod = false;
+    public static boolean usingOAM = false;
     static boolean OAMWarning = false;
     public static String guiToOpen = null;
-    static boolean foundLivid = false;
-    static Entity livid = null;
-    public static double cakeTime;
-    public static double nextBonzoUse = 0;
     public static boolean firstLaunch = false;
-
-    public static final ResourceLocation CAKE_ICON = new ResourceLocation("dsm", "icons/cake.png");
-    public static final ResourceLocation BONZO_ICON = new ResourceLocation("dsm", "icons/bonzo.png");
-
-    static String[] riddleSolutions = {"The reward is not in my chest!", "At least one of them is lying, and the reward is not in",
-            "My chest doesn't have the reward. We are all telling the truth", "My chest has the reward and I'm telling the truth",
-            "The reward isn't in any of our chests", "Both of them are telling the truth."};
-    static BlockPos riddleChest = null;
-    static Map<String, String[]> triviaSolutions = new HashMap<>();
-    static String[] triviaAnswers = null;
-    static Entity highestBlaze = null;
-    static Entity lowestBlaze = null;
-    // Among Us colours
-    static final int[] CREEPER_COLOURS = {0x50EF39, 0xC51111, 0x132ED1, 0x117F2D, 0xED54BA, 0xEF7D0D, 0xF5F557, 0xD6E0F0, 0x6B2FBB, 0x39FEDC};
-    static boolean drawCreeperLines = false;
-    static Vec3 creeperLocation = new Vec3(0, 0, 0);
-    static List<Vec3[]> creeperLines = new ArrayList<>();
-    static boolean prevInWaterRoom = false;
-    static boolean inWaterRoom = false;
-    static String waterAnswers = null;
-    static AxisAlignedBB correctTicTacToeButton = null;
-    static Pattern startsWithTerminalPattern = Pattern.compile("[A-Z]{2,}");
-    static Slot[] clickInOrderSlots = new Slot[36];
-    static int lastChronomatronRound = 0;
-    static List<String> chronomatronPattern = new ArrayList<>();
-    static int chronomatronMouseClicks = 0;
-    static int lastUltraSequencerClicked = 0;
-    static ItemStack[] experimentTableSlots = new ItemStack[54];
-    static int pickBlockBind;
-    static boolean pickBlockBindSwapped = false;
-    static String terminalColorNeeded;
-    static int[] terminalNumberNeeded = new int[4];
-
-    static double dungeonStartTime = 0;
-    static double bloodOpenTime = 0;
-    static double watcherClearTime = 0;
-    static double bossClearTime = 0;
-    static int witherDoors = 0;
-    static int dungeonDeaths = 0;
-    static int puzzleFails = 0;
-
-    static String lastSkill = "Farming";
-    public static boolean showSkillTracker;
-    public static StopWatch skillStopwatch = new StopWatch();
-	static double farmingXP = 0;
-	public static double farmingXPGained = 0;
-	static double miningXP = 0;
-	public static double miningXPGained = 0;
-	static double combatXP = 0;
-	public static double combatXPGained = 0;
-	static double foragingXP = 0;
-	public static double foragingXPGained = 0;
-	static double fishingXP = 0;
-	public static double fishingXPGained = 0;
-	static double enchantingXP = 0;
-	public static double enchantingXPGained = 0;
-	static double alchemyXP = 0;
-	public static double alchemyXPGained = 0;
-	static double xpLeft = 0;
-	static double timeSinceGained = 0;
     
     public static String MAIN_COLOUR;
     public static String SECONDARY_COLOUR;
@@ -172,112 +79,59 @@ public class DankersSkyblockMod {
     public static String VALUE_COLOUR;
     public static String SKILL_AVERAGE_COLOUR;
     public static String ANSWER_COLOUR;
-    public static String SKILL_50_COLOUR;
-    public static String COORDS_COLOUR;
-    public static String CAKE_COLOUR;
-    public static String SKILL_TRACKER_COLOUR;
-    public static String TRIVIA_WRONG_ANSWER_COLOUR;
-    public static String BONZO_COLOR;
-    public static int LOWEST_BLAZE_COLOUR;
-    public static int HIGHEST_BLAZE_COLOUR;
-    public static int PET_1_TO_9;
-    public static int PET_10_TO_19;
-    public static int PET_20_TO_29;
-    public static int PET_30_TO_39;
-    public static int PET_40_TO_49;
-    public static int PET_50_TO_59;
-    public static int PET_60_TO_69;
-    public static int PET_70_TO_79;
-    public static int PET_80_TO_89;
-    public static int PET_90_TO_99;
-    public static int PET_100;
-    public static int ULTRASEQUENCER_NEXT;
-    public static int ULTRASEQUENCER_NEXT_TO_NEXT;
-    public static int CHRONOMATRON_NEXT;
-    public static int CHRONOMATRON_NEXT_TO_NEXT;
-    public static int CLICK_IN_ORDER_NEXT;
-    public static int CLICK_IN_ORDER_NEXT_TO_NEXT;
 
     @EventHandler
     public void init(FMLInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(this);
-        MinecraftForge.EVENT_BUS.register(new PacketHandler());
+        MinecraftForge.EVENT_BUS.register(new ArrowTerminalSolver());
+        MinecraftForge.EVENT_BUS.register(new AutoDisplay());
+        MinecraftForge.EVENT_BUS.register(new AutoSwapToPickBlock());
+        MinecraftForge.EVENT_BUS.register(new BlazeSolver());
+        MinecraftForge.EVENT_BUS.register(new BlockAbilities());
+        MinecraftForge.EVENT_BUS.register(new BlockPlacingFlowers());
+        MinecraftForge.EVENT_BUS.register(new BlockWrongSlayer());
+        MinecraftForge.EVENT_BUS.register(new BlockWrongTerminalClicks());
+        MinecraftForge.EVENT_BUS.register(new BonzoMaskTimer());
+        MinecraftForge.EVENT_BUS.register(new BoulderSolver());
+        MinecraftForge.EVENT_BUS.register(new CakeTimer());
+        MinecraftForge.EVENT_BUS.register(new ChronomatronSolver());
+        MinecraftForge.EVENT_BUS.register(new ClickInOrderSolver());
+        MinecraftForge.EVENT_BUS.register(new CreeperSolver());
+        MinecraftForge.EVENT_BUS.register(new DungeonTimer());
+        MinecraftForge.EVENT_BUS.register(new ExpertiseLore());
+        MinecraftForge.EVENT_BUS.register(new FasterMaddoxCalling());
+        MinecraftForge.EVENT_BUS.register(new GoldenEnchants());
+        MinecraftForge.EVENT_BUS.register(new GolemSpawningAlert());
+        MinecraftForge.EVENT_BUS.register(new GpartyNotifications());
+        MinecraftForge.EVENT_BUS.register(new HideTooltipsInExperiments());
+        MinecraftForge.EVENT_BUS.register(new LividSolver());
+        MinecraftForge.EVENT_BUS.register(new LootDisplay());
+        MinecraftForge.EVENT_BUS.register(new LootTracker());
+        MinecraftForge.EVENT_BUS.register(new LowHealthNotifications());
+        MinecraftForge.EVENT_BUS.register(new NecronNotifications());
+        MinecraftForge.EVENT_BUS.register(new NoF3Coords());
+        MinecraftForge.EVENT_BUS.register(new NotifySlayerSlain());
+        MinecraftForge.EVENT_BUS.register(new PetColours());
+        MinecraftForge.EVENT_BUS.register(new Reparty());
+        MinecraftForge.EVENT_BUS.register(new SelectAllColourSolver());
+        MinecraftForge.EVENT_BUS.register(new Skill50Display());
+        MinecraftForge.EVENT_BUS.register(new SkillTracker());
+        MinecraftForge.EVENT_BUS.register(new SpamHider());
+        MinecraftForge.EVENT_BUS.register(new SpiritBearAlert());
+        MinecraftForge.EVENT_BUS.register(new StartsWithSolver());
+        MinecraftForge.EVENT_BUS.register(new StopSalvagingStarredItems());
+        MinecraftForge.EVENT_BUS.register(new SuperpairsSolver());
+        MinecraftForge.EVENT_BUS.register(new ThreeManSolver());
+        MinecraftForge.EVENT_BUS.register(new TicTacToeSolver());
+        MinecraftForge.EVENT_BUS.register(new TriviaSolver());
+        MinecraftForge.EVENT_BUS.register(new UltrasequencerSolver());
+        MinecraftForge.EVENT_BUS.register(new UpdateChecker());
+        MinecraftForge.EVENT_BUS.register(new WatcherReadyAlert());
+        MinecraftForge.EVENT_BUS.register(new WaterSolver());
 
         ConfigHandler.reloadConfig();
-
-        // For golden enchants
-        t6Enchants.put("9Angler VI", "6Angler VI");
-        t6Enchants.put("9Bane of Arthropods VI", "6Bane of Arthropods VI");
-        t6Enchants.put("9Caster VI", "6Caster VI");
-        t6Enchants.put("9Compact X", "6Compact X");
-        t6Enchants.put("9Critical VI", "6Critical VI");
-        t6Enchants.put("9Dragon Hunter V", "6Dragon Hunter V");
-        t6Enchants.put("9Efficiency VI", "6Efficiency VI");
-        t6Enchants.put("9Ender Slayer VI", "6Ender Slayer VI");
-        t6Enchants.put("9Experience IV", "6Experience IV");
-        t6Enchants.put("9Expertise X", "6Expertise X");
-        t6Enchants.put("9Feather Falling X", "6Feather Falling X");
-        t6Enchants.put("9Frail VI", "6Frail VI");
-        t6Enchants.put("9Giant Killer VI", "6Giant Killer VI");
-        t6Enchants.put("9Growth VI", "6Growth VI");
-        t6Enchants.put("9Infinite Quiver X", "6Infinite Quiver X");
-        t6Enchants.put("9Lethality VI", "6Lethality VI");
-        t6Enchants.put("9Life Steal IV", "6Life Steal IV");
-        t6Enchants.put("9Looting IV", "6Looting IV");
-        t6Enchants.put("9Luck VI", "6Luck VI");
-        t6Enchants.put("9Luck of the Sea VI", "6Luck of the Sea VI");
-        t6Enchants.put("9Lure VI", "6Lure VI");
-        t6Enchants.put("9Magnet VI", "6Magnet VI");
-        t6Enchants.put("9Overload V", "6Overload V");
-        t6Enchants.put("9Power VI", "6Power VI");
-        t6Enchants.put("9Protection VI", "6Protection VI");
-        t6Enchants.put("9Scavenger IV", "6Scavenger IV");
-        t6Enchants.put("9Scavenger V", "6Scavenger V");
-        t6Enchants.put("9Sharpness VI", "6Sharpness VI");
-        t6Enchants.put("9Smite VI", "6Smite VI");
-        t6Enchants.put("9Spiked Hook VI", "6Spiked Hook VI");
-        t6Enchants.put("9Thunderlord VI", "6Thunderlord VI");
-        t6Enchants.put("9Vampirism VI", "6Vampirism VI");
-
-        triviaSolutions.put("What is the status of The Watcher?", new String[]{"Stalker"});
-        triviaSolutions.put("What is the status of Bonzo?", new String[]{"New Necromancer"});
-        triviaSolutions.put("What is the status of Scarf?", new String[]{"Apprentice Necromancer"});
-        triviaSolutions.put("What is the status of The Professor?", new String[]{"Professor"});
-        triviaSolutions.put("What is the status of Thorn?", new String[]{"Shaman Necromancer"});
-        triviaSolutions.put("What is the status of Livid?", new String[]{"Master Necromancer"});
-        triviaSolutions.put("What is the status of Sadan?", new String[]{"Necromancer Lord"});
-        triviaSolutions.put("What is the status of Maxor?", new String[]{"Young Wither"});
-        triviaSolutions.put("What is the status of Goldor?", new String[]{"Wither Soldier"});
-        triviaSolutions.put("What is the status of Storm?", new String[]{"Elementalist"});
-        triviaSolutions.put("What is the status of Necron?", new String[]{"Wither Lord"});
-        triviaSolutions.put("How many total Fairy Souls are there?", new String[]{"220 Fairy Souls"});
-        triviaSolutions.put("How many Fairy Souls are there in Spider's Den?", new String[]{"17 Fairy Souls"});
-        triviaSolutions.put("How many Fairy Souls are there in The End?", new String[]{"12 Fairy Souls"});
-        triviaSolutions.put("How many Fairy Souls are there in The Barn?", new String[]{"7 Fairy Souls"});
-        triviaSolutions.put("How many Fairy Souls are there in Mushroom Desert?", new String[]{"8 Fairy Souls"});
-        triviaSolutions.put("How many Fairy Souls are there in Blazing Fortress?", new Stri