1.8.4v1.8.4

Merge pull request #42 from bowser0000/development

1 files changed, 0 insertions, 2919 deletions

diff --git a/src/main/java/me/Danker/TheMod.java b/src/main/java/me/Danker/TheMod.java
deleted file mode 100644
index 9f0e935..0000000
--- a/src/main/java/me/Danker/TheMod.java
+++ /dev/null
@@ -1,2919 +0,0 @@
-package me.Danker;
-
-import java.awt.Image;
-import java.awt.SystemTray;
-import java.awt.Toolkit;
-import java.awt.TrayIcon;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.time.StopWatch;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
-
-import com.google.gson.JsonObject;
-
-import me.Danker.commands.ArmourCommand;
-import me.Danker.commands.BankCommand;
-import me.Danker.commands.BlockSlayerCommand;
-import me.Danker.commands.DHelpCommand;
-import me.Danker.commands.DankerGuiCommand;
-import me.Danker.commands.DisplayCommand;
-import me.Danker.commands.DungeonsCommand;
-import me.Danker.commands.GetkeyCommand;
-import me.Danker.commands.GuildOfCommand;
-import me.Danker.commands.ImportFishingCommand;
-import me.Danker.commands.LobbySkillsCommand;
-import me.Danker.commands.LootCommand;
-import me.Danker.commands.MoveCommand;
-import me.Danker.commands.PetsCommand;
-import me.Danker.commands.ReloadConfigCommand;
-import me.Danker.commands.ResetLootCommand;
-import me.Danker.commands.ScaleCommand;
-import me.Danker.commands.SetkeyCommand;
-import me.Danker.commands.SkillTrackerCommand;
-import me.Danker.commands.SkillsCommand;
-import me.Danker.commands.SkyblockPlayersCommand;
-import me.Danker.commands.SlayerCommand;
-import me.Danker.commands.ToggleCommand;
-import me.Danker.gui.DankerGui;
-import me.Danker.gui.DisplayGui;
-import me.Danker.gui.EditLocationsGui;
-import me.Danker.gui.OnlySlayerGui;
-import me.Danker.gui.PuzzleSolversGui;
-import me.Danker.gui.SkillTrackerGui;
-import me.Danker.handlers.APIHandler;
-import me.Danker.handlers.ConfigHandler;
-import me.Danker.handlers.PacketHandler;
-import me.Danker.handlers.ScoreboardHandler;
-import me.Danker.handlers.TextRenderer;
-import me.Danker.utils.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiChat;
-import net.minecraft.client.gui.inventory.GuiChest;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItemFrame;
-import net.minecraft.entity.monster.EntityCreeper;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.event.ClickEvent;
-import net.minecraft.event.ClickEvent.Action;
-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.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StringUtils;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
-import net.minecraftforge.client.ClientCommandHandler;
-import net.minecraftforge.client.event.ClientChatReceivedEvent;
-import net.minecraftforge.client.event.GuiScreenEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
-import net.minecraftforge.client.event.sound.PlaySoundEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.EntityJoinWorldEvent;
-import net.minecraftforge.event.entity.player.EntityInteractEvent;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-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;
-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;
-
-@Mod(modid = TheMod.MODID, version = TheMod.VERSION, clientSideOnly = true)
-public class TheMod
-{
-    public static final String MODID = "Danker's Skyblock Mod";
-    public static final String VERSION = "1.8.3";
-    
-    static double checkItemsNow = 0;
-    static double itemsChecked = 0;
-    public static Map<String, String> t6Enchants = new HashMap<String, String>();
-    public static Pattern pattern = Pattern.compile("");
-    static boolean updateChecked = false;
-    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[2];
-    static int lastMouse = -1;
-    static boolean usingLabymod = false;
-    public static String guiToOpen = null;
-	static boolean foundLivid = false;
-	static Entity livid = null;
-	public static double cakeTime;
-	
-	public static final ResourceLocation CAKE_ICON = new ResourceLocation("dsm", "icons/cake.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 Map<String, String[]> triviaSolutions = new HashMap<String, String[]>();
-	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<Vec3[]>();
-	static boolean prevInWaterRoom = false;
-	static boolean inWaterRoom = false;
-	
-    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;
-    
-    public static String MAIN_COLOUR;
-    public static String SECONDARY_COLOUR;
-    public static String ERROR_COLOUR;
-    public static String DELIMITER_COLOUR;
-    public static String TYPE_COLOUR;
-    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 int LOWEST_BLAZE_COLOUR;
-    public static int HIGHEST_BLAZE_COLOUR;
-    
-    @EventHandler
-    public void init(FMLInitializationEvent event) {
-		MinecraftForge.EVENT_BUS.register(this);
-		MinecraftForge.EVENT_BUS.register(new PacketHandler());
-		
-		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[]{"209 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 String[]{"19 Fairy Souls"});
-		triviaSolutions.put("How many Fairy Souls are there in The Park?", new String[]{"11 Fairy Souls"});
-		triviaSolutions.put("How many Fairy Souls are there in Jerry's Workshop?", new String[]{"5 Fairy Souls"});
-		triviaSolutions.put("How many Fairy Souls are there in Hub?", new String[]{"79 Fairy Souls"});
-		triviaSolutions.put("How many Fairy Souls are there in The Hub?", new String[]{"79 Fairy Souls"});
-		triviaSolutions.put("How many Fairy Souls are there in Deep Caverns?", new String[]{"21 Fairy Souls"});
-		triviaSolutions.put("How many Fairy Souls are there in Gold Mine?", new String[]{"12 Fairy Souls"});
-		triviaSolutions.put("How many Fairy Souls are there in Dungeon Hub?", new String[]{"7 Fairy Souls"});
-		triviaSolutions.put("Which brother is on the Spider's Den?", new String[]{"Rick"});
-		triviaSolutions.put("What is the name of Rick's brother?", new String[]{"Pat"});
-		triviaSolutions.put("What is the name of the Painter in the Hub?", new String[]{"Marco"});
-		triviaSolutions.put("What is the name of the person that upgrades pets?", new String[]{"Kat"});
-		triviaSolutions.put("What is the name of the lady of the Nether?", new String[]{"Elle"});
-		triviaSolutions.put("Which villager in the Village gives you a Rogue Sword?", new String[]{"Jamie"});
-		triviaSolutions.put("How many unique minions are there?", new String[]{"52 Minions"});
-		triviaSolutions.put("Which of these enemies does not spawn in the Spider's Den?", new String[]{"Zombie Spider", "Cave Spider", "Wither Skeleton",
-																									   "Dashing Spooder", "Broodfather", "Night Spider"});
-		triviaSolutions.put("Which of these monsters only spawns at night?", new String[]{"Zombie Villager", "Ghast"});
-		triviaSolutions.put("Which of these is not a dragon in The End?", new String[]{"Zoomer Dragon", "Weak Dragon", "Stonk Dragon", "Holy Dragon", "Boomer Dragon",
-																					   "Booger Dragon", "Older Dragon", "Elder Dragon", "Stable Dragon", "Professor Dragon"});
-		
-		String patternString = "(" + String.join("|", t6Enchants.keySet()) + ")";
-		pattern = Pattern.compile(patternString);
-		
-		keyBindings[0] = new KeyBinding("Open Maddox Menu", Keyboard.KEY_M, "Danker's Skyblock Mod");
-		keyBindings[1] = new KeyBinding("Start/Stop Skill Tracker", Keyboard.KEY_NUMPAD5, "Danker's Skyblock Mod");
-		
-		for (int i = 0; i < keyBindings.length; i++) {
-			ClientRegistry.registerKeyBinding(keyBindings[i]);
-		}
-    }
-    
-    @EventHandler
-    public void preInit(final FMLPreInitializationEvent event) {
-    	ClientCommandHandler.instance.registerCommand(new ToggleCommand());
-    	ClientCommandHandler.instance.registerCommand(new SetkeyCommand());
-    	ClientCommandHandler.instance.registerCommand(new GetkeyCommand());
-    	ClientCommandHandler.instance.registerCommand(new LootCommand());
-    	ClientCommandHandler.instance.registerCommand(new ReloadConfigCommand());
-    	ClientCommandHandler.instance.registerCommand(new DisplayCommand());
-    	ClientCommandHandler.instance.registerCommand(new MoveCommand());
-    	ClientCommandHandler.instance.registerCommand(new SlayerCommand());
-    	ClientCommandHandler.instance.registerCommand(new SkillsCommand());
-    	ClientCommandHandler.instance.registerCommand(new GuildOfCommand());
-    	ClientCommandHandler.instance.registerCommand(new DHelpCommand());
-    	ClientCommandHandler.instance.registerCommand(new PetsCommand());
-    	ClientCommandHandler.instance.registerCommand(new BankCommand());
-    	ClientCommandHandler.instance.registerCommand(new ArmourCommand());
-    	ClientCommandHandler.instance.registerCommand(new ImportFishingCommand());
-    	ClientCommandHandler.instance.registerCommand(new ResetLootCommand());
-    	ClientCommandHandler.instance.registerCommand(new ScaleCommand());
-    	ClientCommandHandler.instance.registerCommand(new SkyblockPlayersCommand());
-    	ClientCommandHandler.instance.registerCommand(new BlockSlayerCommand());
-    	ClientCommandHandler.instance.registerCommand(new DungeonsCommand());
-    	ClientCommandHandler.instance.registerCommand(new LobbySkillsCommand());
-    	ClientCommandHandler.instance.registerCommand(new DankerGuiCommand());
-    	ClientCommandHandler.instance.registerCommand(new SkillTrackerCommand());
-    }
-    
-    @EventHandler
-    public void postInit(final FMLPostInitializationEvent event) {
-    	usingLabymod = Loader.isModLoaded("labymod");
-    	System.out.println("LabyMod detection: " + usingLabymod);
-    }
-    
-    // Update checker
-    @SubscribeEvent
-    public void onJoin(EntityJoinWorldEvent event) {
-    	if (!updateChecked) {
-			updateChecked = true;
-			
-    		// MULTI THREAD DRIFTING
-    		new Thread(() -> {
-    			EntityPlayer player = Minecraft.getMinecraft().thePlayer;	
-    			
-    			System.err.println("Checking for updates...");
-    			JsonObject latestRelease = APIHandler.getResponse("https://api.github.com/repos/bowser0000/SkyblockMod/releases/latest");
-    			
-    			String latestTag = latestRelease.get("tag_name").getAsString();
-    			DefaultArtifactVersion currentVersion = new DefaultArtifactVersion(VERSION);
-    			DefaultArtifactVersion latestVersion = new DefaultArtifactVersion(latestTag.substring(1));
-    			
-    			if (currentVersion.compareTo(latestVersion) < 0) {
-    				String releaseURL = latestRelease.get("html_url").getAsString();
-    				
-    				ChatComponentText update = new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "  [UPDATE]  ");
-    				update.setChatStyle(update.getChatStyle().setChatClickEvent(new ClickEvent(Action.OPEN_URL, releaseURL)));
-    					
-    				try {
-						Thread.sleep(2000);
-					} catch (InterruptedException ex) {
-						System.err.println(ex);
-					}
-    				player.addChatMessage(new ChatComponentText(ERROR_COLOUR + MODID + " is outdated. Please update to " + latestTag + ".\n").appendSibling(update));
-    			}
-    		}).start();
-    	}
-    }
-    
-    @SubscribeEvent
-    public void onWorldChange(WorldEvent.Load event) {
-    	foundLivid = false;
-    	livid = null;
-    }
-    
-    // It randomly broke, so I had to make it the highest priority
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
-    public void onChat(ClientChatReceivedEvent event) {
-    	String message = StringUtils.stripControlCodes(event.message.getUnformattedText());
-    	
-    	if (!Utils.inSkyblock) return;
-    	
-    	// Action Bar
-    	if (event.type == 2) {
-    		String[] actionBarSections = event.message.getUnformattedText().split(" {3,}");
-    		for (String section : actionBarSections) {
-    			if (section.contains("+") && section.contains("/") && section.contains("(")) {
-    				if (!section.contains("Runecrafting") && !section.contains("Carpentry")) {
-    					int limit = section.contains("Farming") ? 60 : 50;
-    					double currentXP = Double.parseDouble(section.substring(section.indexOf("(") + 1, section.indexOf("/")).replace(",", ""));
-    					int xpToLevelUp = Integer.parseInt(section.substring(section.indexOf("/") + 1, section.indexOf(")")).replaceAll(",", ""));
-    					xpLeft = xpToLevelUp - currentXP;
-    					int previousXP = Utils.getPastXpEarned(xpToLevelUp, limit);
-    					double totalXP = currentXP + previousXP;
-    					double xpGained = Double.parseDouble(section.substring(section.indexOf("+") + 1, section.indexOf(" ")).replace(",", ""));
-    					String skill = section.substring(section.indexOf(" ") + 1, section.lastIndexOf(" "));
-    					switch (skill) {
-	    					case "Farming":
-	    						lastSkill = "Farming";
-	    						if (farmingXP == 0) {
-	    							farmingXP = totalXP;
-	    						} else {
-	    							if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) farmingXPGained += totalXP - farmingXP;
-	    							farmingXP = totalXP;
-	    						}
-	    						break;
-	    					case "Mining":
-	    						lastSkill = "Mining";
-	    						if (miningXP == 0) {
-	    							miningXP = totalXP;
-	    						} else {
-	    							if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) miningXPGained += totalXP - miningXP;
-	    							miningXP = totalXP;
-	    						}
-	    						break;
-	    					case "Combat":
-	    						lastSkill = "Combat";
-	    						if (combatXP == 0) {
-	    							combatXP = totalXP;
-	    						} else {
-	    							if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) combatXPGained += totalXP - combatXP;
-	    							combatXP = totalXP;
-	    						}
-	    						break;
-	    					case "Foraging":
-	    						lastSkill = "Foraging";
-	    						if (foragingXP == 0) {
-	    							foragingXP = totalXP;
-	    						} else {
-	    							if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) foragingXPGained += totalXP - foragingXP;
-	    							foragingXP = totalXP;
-	    						}
-	    						break;
-	    					case "Fishing":
-	    						lastSkill = "Fishing";
-	    						if (fishingXP == 0) {
-	    							fishingXP = totalXP;
-	    						} else {
-	    							if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) fishingXPGained += totalXP - fishingXP;
-	    							fishingXP = totalXP;
-	    						}
-	    						break;
-	    					case "Enchanting":
-	    						lastSkill = "Enchanting";
-	    						if (enchantingXP == 0) {
-	    							enchantingXP = totalXP;
-	    						} else {
-	    							if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) enchantingXPGained += totalXP - enchantingXP;
-	    							enchantingXP = totalXP;
-	    						}
-	    						break;
-	    					case "Alchemy":
-	    						lastSkill = "Alchemy";
-	    						if (alchemyXP == 0) {
-	    							alchemyXP = totalXP;
-	    						} else {
-	    							if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) alchemyXPGained += totalXP - alchemyXP;
-	    							alchemyXP = totalXP;
-	    						}
-	    						break;
-	    					default:
-	    						System.err.println("Unknown skill.");
-    					}
-    				}
-    				
-    				if (ToggleCommand.skill50DisplayToggled && !section.contains("Runecrafting")) {
-    					String xpGained = section.substring(section.indexOf("+"), section.indexOf("(") - 1);
-    					double currentXp = Double.parseDouble(section.substring(section.indexOf("(") + 1, section.indexOf("/")).replace(",", ""));
-    					int limit;
-    					int totalXp;
-    					if (section.contains("Farming")) {
-    						limit = 60;
-    						totalXp = 111672425;
-    					} else {
-    						limit = 50;
-    						totalXp = 55172425;
-    					}
-    					int previousXp = Utils.getPastXpEarned(Integer.parseInt(section.substring(section.indexOf("/") + 1, section.indexOf(")")).replaceAll(",", "")), limit);
-    					double percentage = (double) Math.floor(((currentXp + previousXp) / totalXp) * 10000D) / 100D;
-    					
-    					NumberFormat nf = NumberFormat.getNumberInstance(Locale.US);
-    					skillTimer = SKILL_TIME;
-    					showSkill = true;
-    					skillText = SKILL_50_COLOUR + xpGained + " (" + nf.format(currentXp + previousXp) + "/" + nf.format(totalXp) + ") " + percentage + "%";
-    				}
-    			}
-    		}
-    		return;
-    	}
-    	
-        // Dungeon chat spoken by an NPC, containing :
-        if (ToggleCommand.threeManToggled && Utils.inDungeons && message.contains("[NPC]")) {
-        	for (String solution : riddleSolutions) {
-        		if (message.contains(solution)) {
-        			String npcName = message.substring(message.indexOf("]") + 2, message.indexOf(":"));
-        			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(ANSWER_COLOUR + EnumChatFormatting.BOLD + StringUtils.stripControlCodes(npcName) + MAIN_COLOUR + " has the blessing."));
-        			break;
-        		}
-        	}
-        }
-        
-        if (message.contains("[BOSS] The Watcher: You have proven yourself. You may pass.")) {
-        	watcherClearTime = System.currentTimeMillis() / 1000;
-        }
-		if (message.contains("PUZZLE FAIL! ") || message.contains("chose the wrong answer! I shall never forget this moment")) {
-			puzzleFails++;
-		}
-        
-    	if (message.contains(":")) return;
-    	
-		// Spirit Sceptre
-		if (!ToggleCommand.sceptreMessages && message.contains("Your Spirit Sceptre hit ")) {
-			event.setCanceled(true);
-			return;
-		}
-		// Midas Staff
-		if (!ToggleCommand.midasStaffMessages && message.contains("Your Molten Wave hit ")) {
-			event.setCanceled(true);
-			return;
-		}
-		// Heals
-		if (!ToggleCommand.healMessages && message.contains(" health!") && (message.contains("You healed ") || message.contains(" healed you for "))) {
-			event.setCanceled(true);
-			return;
-		}
-    	
-        if (ToggleCommand.oruoToggled && Utils.inDungeons) {
-        	// Don't set every answer to wrong with this question
-        	if (message.contains("What SkyBlock year is it?")) triviaAnswers = null;
-        	
-        	for (String question : triviaSolutions.keySet()) {
-        		if (message.contains(question)) {
-        			triviaAnswers = triviaSolutions.get(question);
-        			break;
-        		}
-        	}
-        	
-        	// Set wrong answers to red and remove click events
-        	if (triviaAnswers != null && (message.contains("ⓐ") || message.contains("ⓑ") || message.contains("ⓒ"))) {
-        		boolean isSolution = false;
-        		for (String solution : triviaAnswers) {
-        			if (message.contains(solution)) isSolution = true;
-        		}
-        		if (!isSolution) {
-        			char letter = message.charAt(5);
-        			String option = message.substring(6, message.length());
-        			event.message = new ChatComponentText("     " + EnumChatFormatting.GOLD + letter + TRIVIA_WRONG_ANSWER_COLOUR + option);
-        			return;
-        		}
-        	}
-        }
-    	
-		if (ToggleCommand.gpartyToggled) {
-			if (message.contains(" has invited all members of ")) {
-				try {
-					final SystemTray tray = SystemTray.getSystemTray();
-					final Image image = Toolkit.getDefaultToolkit().createImage("icon.png");
-					final TrayIcon trayIcon = new TrayIcon(image, "Guild Party Notifier");
-					trayIcon.setImageAutoSize(true);
-					trayIcon.setToolTip("Guild Party Notifier");
-					tray.add(trayIcon);
-					trayIcon.displayMessage("Guild Party", message, TrayIcon.MessageType.INFO);
-					tray.remove(trayIcon);
-				} catch (Exception ex) {
-					System.err.print(ex);
-				}
-			}
-		}
-		
-		if (ToggleCommand.golemAlertToggled) {
-			if (message.contains("The ground begins to shake as an Endstone Protector rises from below!")) {
-				Utils.createTitle(EnumChatFormatting.RED + "GOLEM SPAWNING!", 3);
-			}
-		}
-		
-		if (message.contains("Yum! You gain +") && message.contains(" for 48 hours!")) {
-			cakeTime = System.currentTimeMillis() / 1000 + 172800; // Add 48 hours
-			ConfigHandler.writeDoubleConfig("misc", "cakeTime", cakeTime);
-		}
-		
-		boolean wolfRNG = false;
-		boolean spiderRNG = false;
-		boolean zombieRNG = false;
-		// T6 books
-		if (message.contains("VERY RARE DROP!  (Enchanted Book)") || message.contains("CRAZY RARE DROP!  (Enchanted Book)")) {
-			// Loop through scoreboard to see what boss you're doing
-			List<String> scoreboard = ScoreboardHandler.getSidebarLines();
-			for (String s : scoreboard) {
-				String sCleaned = ScoreboardHandler.cleanSB(s);
-				if (sCleaned.contains("Sven Packmaster")) {
-					LootCommand.wolfBooks++;
-					ConfigHandler.writeIntConfig("wolf", "book", LootCommand.wolfBooks);
-				} else if (sCleaned.contains("Tarantula Broodfather")) {
-					LootCommand.spiderBooks++;
-					ConfigHandler.writeIntConfig("spider", "book", LootCommand.spiderBooks);
-				} else if (sCleaned.contains("Revenant Horror")) {
-					LootCommand.zombieBooks++;
-					ConfigHandler.writeIntConfig("zombie", "book", LootCommand.zombieBooks);
-				}
-			}
-		}
-
-		// Wolf
-		if (message.contains("Talk to Maddox to claim your Wolf Slayer XP!")) {
-			LootCommand.wolfSvens++;
-			LootCommand.wolfSvensSession++;
-			if (LootCommand.wolfBosses != -1) {
-				LootCommand.wolfBosses++;
-			}
-			if (LootCommand.wolfBossesSession != -1) {
-				LootCommand.wolfBossesSession++;
-			}
-			ConfigHandler.writeIntConfig("wolf", "svens", LootCommand.wolfSvens);
-			ConfigHandler.writeIntConfig("wolf", "bossRNG", LootCommand.wolfBosses);
-		} else if (message.contains("RARE DROP! (Hamster Wheel)")) {
-			LootCommand.wolfWheelsDrops++;
-			LootCommand.wolfWheelsDropsSession++;
-			ConfigHandler.writeIntConfig("wolf", "wheelDrops", LootCommand.wolfWheelsDrops);
-		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Spirit Rune I)")) { // Removing the unicode here *should* fix rune drops not counting
-			LootCommand.wolfSpirits++;
-			LootCommand.wolfSpiritsSession++;
-			ConfigHandler.writeIntConfig("wolf", "spirit", LootCommand.wolfSpirits);
-		} else if (message.contains("CRAZY RARE DROP!  (Red Claw Egg)")) {
-			wolfRNG = true;
-			LootCommand.wolfEggs++;
-			LootCommand.wolfEggsSession++;
-			ConfigHandler.writeIntConfig("wolf", "egg", LootCommand.wolfEggs);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_RED + "RED CLAW EGG!", 3);
-		} else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Couture Rune I)")) {
-			wolfRNG = true;
-			LootCommand.wolfCoutures++;
-			LootCommand.wolfCouturesSession++;
-			ConfigHandler.writeIntConfig("wolf", "couture", LootCommand.wolfCoutures);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "COUTURE RUNE!", 3);
-		} else if (message.contains("CRAZY RARE DROP!  (Grizzly Bait)") || message.contains("CRAZY RARE DROP! (Rename Me)")) { // How did Skyblock devs even manage to make this item Rename Me
-			wolfRNG = true;
-			LootCommand.wolfBaits++;
-			LootCommand.wolfBaitsSession++;
-			ConfigHandler.writeIntConfig("wolf", "bait", LootCommand.wolfBaits);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.AQUA + "GRIZZLY BAIT!", 3);
-		} else if (message.contains("CRAZY RARE DROP!  (Overflux Capacitor)")) {
-			wolfRNG = true;
-			LootCommand.wolfFluxes++;
-			LootCommand.wolfFluxesSession++;
-			ConfigHandler.writeIntConfig("wolf", "flux", LootCommand.wolfFluxes);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "OVERFLUX CAPACITOR!", 5);
-		} else if (message.contains("Talk to Maddox to claim your Spider Slayer XP!")) { // Spider
-			LootCommand.spiderTarantulas++;
-			LootCommand.spiderTarantulasSession++;
-			if (LootCommand.spiderBosses != -1) {
-				LootCommand.spiderBosses++;
-			}
-			if (LootCommand.spiderBossesSession != -1) {
-				LootCommand.spiderBossesSession++;
-			}
-			ConfigHandler.writeIntConfig("spider", "tarantulas", LootCommand.spiderTarantulas);
-			ConfigHandler.writeIntConfig("spider", "bossRNG", LootCommand.spiderBosses);
-		} else if (message.contains("RARE DROP! (Toxic Arrow Poison)")) {
-			LootCommand.spiderTAPDrops++;
-			LootCommand.spiderTAPDropsSession++;
-			ConfigHandler.writeIntConfig("spider", "tapDrops", LootCommand.spiderTAPDrops);
-		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Bite Rune I)")) {
-			LootCommand.spiderBites++;
-			LootCommand.spiderBitesSession++;
-			ConfigHandler.writeIntConfig("spider", "bite", LootCommand.spiderBites);
-		} else if (message.contains("VERY RARE DROP!  (Spider Catalyst)")) {
-			LootCommand.spiderCatalysts++;
-			LootCommand.spiderCatalystsSession++;
-			ConfigHandler.writeIntConfig("spider", "catalyst", LootCommand.spiderCatalysts);
-		} else if (message.contains("CRAZY RARE DROP!  (Fly Swatter)")) {
-			spiderRNG = true;
-			LootCommand.spiderSwatters++;
-			LootCommand.spiderSwattersSession++;
-			ConfigHandler.writeIntConfig("spider", "swatter", LootCommand.spiderSwatters);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.LIGHT_PURPLE + "FLY SWATTER!", 3);
-		} else if (message.contains("CRAZY RARE DROP!  (Tarantula Talisman")) {
-			spiderRNG = true;
-			LootCommand.spiderTalismans++;
-			LootCommand.spiderTalismansSession++;
-			ConfigHandler.writeIntConfig("spider", "talisman", LootCommand.spiderTalismans);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "TARANTULA TALISMAN!", 3);
-		} else if (message.contains("CRAZY RARE DROP!  (Digested Mosquito)")) {
-			spiderRNG = true;
-			LootCommand.spiderMosquitos++;
-			LootCommand.spiderMosquitosSession++;
-			ConfigHandler.writeIntConfig("spider", "mosquito", LootCommand.spiderMosquitos);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "DIGESTED MOSQUITO!", 5);
-		} else if (message.contains("Talk to Maddox to claim your Zombie Slayer XP!")) { // Zombie
-			LootCommand.zombieRevs++;
-			LootCommand.zombieRevsSession++;
-			if (LootCommand.zombieBosses != -1) {
-				LootCommand.zombieBosses++;
-			}
-			if (LootCommand.zombieBossesSession != 1) {
-				LootCommand.zombieBossesSession++;
-			}
-			ConfigHandler.writeIntConfig("zombie", "revs", LootCommand.zombieRevs);
-			ConfigHandler.writeIntConfig("zombie", "bossRNG", LootCommand.zombieBosses);
-		} else if (message.contains("RARE DROP! (Foul Flesh)")) {
-			LootCommand.zombieFoulFleshDrops++;
-			LootCommand.zombieFoulFleshDropsSession++;
-			ConfigHandler.writeIntConfig("zombie", "foulFleshDrops", LootCommand.zombieFoulFleshDrops);
-		} else if (message.contains("VERY RARE DROP!  (Revenant Catalyst)")) {
-			LootCommand.zombieRevCatas++;
-			LootCommand.zombieRevCatasSession++;
-			ConfigHandler.writeIntConfig("zombie", "revCatalyst", LootCommand.zombieRevCatas);
-		} else if (message.contains("VERY RARE DROP!  (") && message.contains(" Pestilence Rune I)")) {
-			LootCommand.zombiePestilences++;
-			LootCommand.zombiePestilencesSession++;
-			ConfigHandler.writeIntConfig("zombie", "pestilence", LootCommand.zombiePestilences);
-		} else if (message.contains("VERY RARE DROP!  (Undead Catalyst)")) {
-			LootCommand.zombieUndeadCatas++;
-			LootCommand.zombieUndeadCatasSession++;
-			ConfigHandler.writeIntConfig("zombie", "undeadCatalyst", LootCommand.zombieUndeadCatas);
-		} else if (message.contains("CRAZY RARE DROP!  (Beheaded Horror)")) {
-			zombieRNG = true;
-			LootCommand.zombieBeheadeds++;
-			LootCommand.zombieBeheadedsSession++;
-			ConfigHandler.writeIntConfig("zombie", "beheaded", LootCommand.zombieBeheadeds);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_PURPLE + "BEHEADED HORROR!", 3);
-		} else if (message.contains("CRAZY RARE DROP!  (") && message.contains(" Snake Rune I)")) {
-			zombieRNG = true;
-			LootCommand.zombieSnakes++;
-			LootCommand.zombieSnakesSession++;
-			ConfigHandler.writeIntConfig("zombie", "snake", LootCommand.zombieSnakes);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.DARK_GREEN + "SNAKE RUNE!", 3);
-		} else if (message.contains("CRAZY RARE DROP!  (Scythe Blade)")) {
-			zombieRNG = true;
-			LootCommand.zombieScythes++;
-			LootCommand.zombieScythesSession++;
-			ConfigHandler.writeIntConfig("zombie", "scythe", LootCommand.zombieScythes);
-			if (ToggleCommand.rngesusAlerts) Utils.createTitle(EnumChatFormatting.GOLD + "SCYTHE BLADE!", 5);
-		} else if (message.contains("GOOD CATCH!")) { // Fishing
-			LootCommand.goodCatches++;
-			LootCommand.goodCatchesSession++;
-			ConfigHandler.writeIntConfig("fishing", "goodCatch", LootCommand.goodCatches);
-		} else if (message.contains("GREAT CATCH!")) {
-			LootCommand.greatCatches++;
-			LootCommand.greatCatchesSession++;
-			ConfigHandler.writeIntConfig("fishing", "greatCatch", LootCommand.greatCatches);
-		} else if (message.contains("A Squid appeared")) {
-			LootCommand.squids++;
-			LootCommand.squidsSession++;
-			ConfigHandler.writeIntConfig("fishing", "squid", LootCommand.squids);
-			increaseSeaCreatures();
-		} else if (message.contains("You caught a Sea Walker")) {
-			LootCommand.seaWalkers++;
-			LootCommand.seaWalkersSession++;
-			ConfigHandler.writeIntConfig("fishing", "seaWalker", LootCommand.seaWalkers);
-			increaseSeaCreatures();
-		} else if (message.contains("Pitch darkness reveals a Night Squid")) {
-			LootCommand.nightSquids++;
-			LootCommand.nightSquidsSession++;
-			ConfigHandler.writeIntConfig("fishing", "nightSquid", LootCommand.nightSquids);
-			increaseSeaCreatures();
-		} else if (message.contains("You stumbled upon a Sea Guardian")) {
-			LootCommand.seaGuardians++;
-			LootCommand.seaGuardiansSession++;
-			ConfigHandler.writeIntConfig("fishing", "seaGuardian", LootCommand.seaGuardians);
-			increaseSeaCreatures();
-		} else if (message.contains("It looks like you've disrupted the Sea Witch's brewing session. Watch out, she's furious")) {
-			LootCommand.seaWitches++;
-			LootCommand.seaWitchesSession++;
-			ConfigHandler.writeIntConfig("fishing", "seaWitch", LootCommand.seaWitches);
-			increaseSeaCreatures();
-		} else if (message.contains("You reeled in a Sea Archer")) {
-			LootCommand.seaArchers++;
-			LootCommand.seaArchersSession++;
-			ConfigHandler.writeIntConfig("fishing", "seaArcher", LootCommand.seaArchers);
-			increaseSeaCreatures();
-		} else if (message.contains("The Monster of the Deep has emerged")) {
-			LootCommand.monsterOfTheDeeps++;
-			LootCommand.monsterOfTheDeepsSession++;
-			ConfigHandler.writeIntConfig("fishing", "monsterOfDeep", LootCommand.monsterOfTheDeeps);
-			increaseSeaCreatures();
-		} else if (message.contains("Huh? A Catfish")) {
-			LootCommand.catfishes++;
-			LootCommand.catfishesSession++;
-			ConfigHandler.writeIntConfig("fishing", "catfish", LootCommand.catfishes);
-			increaseSeaCreatures();
-		} else if (message.contains("Is this even a fish? It's the Carrot King")) {
-			LootCommand.carrotKings++;
-			LootCommand.carrotKingsSession++;
-			ConfigHandler.writeIntConfig("fishing", "carrotKing", LootCommand.carrotKings);
-			increaseSeaCreatures();
-		} else if (message.contains("Gross! A Sea Leech")) {
-			LootCommand.seaLeeches++;
-			LootCommand.seaLeechesSession++;
-			ConfigHandler.writeIntConfig("fishing", "seaLeech", LootCommand.seaLeeches);
-			increaseSeaCreatures();
-		} else if (message.contains("You've discovered a Guardian Defender of the sea")) {
-			LootCommand.guardianDefenders++;
-			LootCommand.guardianDefendersSession++;
-			ConfigHandler.writeIntConfig("fishing", "guardianDefender", LootCommand.guardianDefenders);
-			increaseSeaCreatures();
-		} else if (message.contains("You have awoken the Deep Sea Protector, prepare for a battle")) {
-			LootCommand.deepSeaProtectors++;
-			LootCommand.deepSeaProtectorsSession++;
-			ConfigHandler.writeIntConfig("fishing", "deepSeaProtector", LootCommand.deepSeaProtectors);
-			increaseSeaCreatures();
-		} else if (message.contains("The Water Hydra has come to test your strength")) {
-			LootCommand.hydras++;
-			LootCommand.hydrasSession++;
-			ConfigHandler.writeIntConfig("fishing", "hydra", LootCommand.hydras);
-			increaseSeaCreatures();
-		} else if (message.contains("The Sea Emperor arises from the depths")) {
-			increaseSeaCreatures();
-			
-			LootCommand.seaEmperors++;
-			LootCommand.empTime = System.currentTimeMillis() / 1000;
-			LootCommand.empSCs = 0;
-			LootCommand.seaEmperorsSession++;
-			LootCommand.empTimeSession = System.currentTimeMillis() / 1000;
-			LootCommand.empSCsSession = 0;
-			ConfigHandler.writeIntConfig("fishing", "seaEmperor", LootCommand.seaEmperors);
-			ConfigHandler.