Add tracker and display for all slayer drops

Added token and 20% chance slayer drops. Also added display for the slayer tracker with /display.

This was more difficult than I thought. I first tried to use the PlayerEvent.ItemPickupEvent event, but it was server side only. Then I tried to use the ClientChatReceivedEvent event, but the boss slain message was sent to late. Ultimately, I decided on the PlaySoundEvent event, which waits for the noise for when a slayer boss dies.

13 files changed, 1157 insertions, 526 deletions

diff --git a/Danker/TheMod.java b/Danker/TheMod.java
new file mode 100644
index 0000000..3e9791b
--- /dev/null
+++ b/Danker/TheMod.java
@@ -0,0 +1,440 @@
+package me.Danker;
+
+import java.awt.Image;
+import java.awt.SystemTray;
+import java.awt.Toolkit;
+import java.awt.TrayIcon;
+import java.util.List;
+
+import me.Danker.commands.DisplayCommand;
+import me.Danker.commands.GetkeyCommand;
+import me.Danker.commands.LootCommand;
+import me.Danker.commands.ReloadConfigCommand;
+import me.Danker.commands.SetkeyCommand;
+import me.Danker.commands.ToggleCommand;
+import me.Danker.handlers.ConfigHandler;
+import me.Danker.handlers.ScoreboardHandler;
+import me.Danker.handlers.TextRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StringUtils;
+import net.minecraftforge.client.ClientCommandHandler;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.client.event.sound.PlaySoundEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+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.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+@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.4";
+    
+    static int checkItemsNow = 0;
+    static int itemsChecked = 0;
+    
+    @EventHandler
+    public void init(FMLInitializationEvent event)
+    {
+		FMLCommonHandler.instance().bus().register(this);
+		MinecraftForge.EVENT_BUS.register(this);
+		
+		final ConfigHandler cf = new ConfigHandler();
+		cf.reloadConfig();
+    }
+    
+    @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());
+    }
+    
+    @SubscribeEvent
+    public void onChat(final ClientChatReceivedEvent event) {
+    	final ToggleCommand tc = new ToggleCommand();
+    	final boolean isGPartyToggled = tc.getToggle("gparty");
+    	String message = event.message.getUnformattedText();
+    	
+    	if (!message.contains(":")) {
+    		if (isGPartyToggled) {
+        		if (message.contains(" has invited all members of ")) {
+        			System.out.println(message);
+        			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);
+        			}
+        		}
+        	}
+        	
+    		final LootCommand lc = new LootCommand();
+    		final ConfigHandler cf = new ConfigHandler();
+    		boolean wolfRNG = false;
+    		boolean spiderRNG = false;
+    		boolean zombieRNG = false;
+    		// T6 books
+    		if (message.contains("VERY 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")) {
+    					lc.wolfBooks++;
+    					cf.writeIntConfig("wolf", "book", lc.wolfBooks);
+    				} else if (sCleaned.contains("Tarantula Broodfather")) {
+    					lc.spiderBooks++;
+    					cf.writeIntConfig("spider", "book", lc.spiderBooks);
+    				} else if (sCleaned.contains("Revenant Horror")) {
+    					lc.zombieBooks++;
+    					cf.writeIntConfig("zombie", "book", lc.zombieBooks);
+    				}
+    			}
+    		}
+
+    		// Wolf
+    		if (message.contains("Talk to Maddox to claim your Wolf Slayer XP!")) {
+    			lc.wolfSvens++;
+    			cf.writeIntConfig("wolf", "svens", lc.wolfSvens);
+    		}
+    		if (message.contains("VERY RARE DROP! (◆ Spirit Rune ")) {
+    			lc.wolfSpirits++;
+    			cf.writeIntConfig("wolf", "spirit", lc.wolfSpirits);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (Red Claw Egg)")) {
+    			wolfRNG = true;
+    			lc.wolfEggs++;
+    			cf.writeIntConfig("wolf", "egg", lc.wolfEggs);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (◆ Couture Rune")) {
+    			wolfRNG = true;
+    			lc.wolfCoutures++;
+    			cf.writeIntConfig("wolf", "couture", lc.wolfCoutures);
+    		}
+    		// How did Skyblock devs even manage to make this item Rename Me
+    		if (message.contains("CRAZY RARE DROP! (Grizzly Bait)") || message.contains("CRAZY RARE DROP! (Rename Me)")) {
+    			wolfRNG = true;
+    			lc.wolfBaits++;
+    			cf.writeIntConfig("wolf", "bait", lc.wolfBaits);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (Overflux Capacitor)")) {
+    			wolfRNG = true;
+    			lc.wolfFluxes++;
+    			cf.writeIntConfig("wolf", "flux", lc.wolfFluxes);
+    		}
+
+    		// Spider
+    		if (message.contains("Talk to Maddox to claim your Spider Slayer XP!")) {
+    			lc.spiderTarantulas++;
+    			cf.writeIntConfig("spider", "tarantulas", lc.spiderTarantulas);
+    		}
+
+    		if (message.contains("VERY RARE DROP! (◆ Bite Rune")) {
+    			lc.spiderBites++;
+    			cf.writeIntConfig("spider", "bite", lc.spiderBites);
+    		}
+    		if (message.contains("VERY RARE DROP! (Spider Catalyst)")) {
+    			lc.spiderCatalysts++;
+    			cf.writeIntConfig("spider", "catalyst", lc.spiderCatalysts);
+    		}
+    		// T3 Spider Book Drop
+    		if (message.contains("CRAZY RARE DROP! (Enchanted Book)")) {
+    			lc.spiderBooks++;
+    			cf.writeIntConfig("spider", "book", lc.spiderBooks);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (Fly Swatter)")) {
+    			spiderRNG = true;
+    			lc.spiderSwatters++;
+    			cf.writeIntConfig("spider", "swatter", lc.spiderSwatters);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (Tarantula Talisman")) {
+    			spiderRNG = true;
+    			lc.spiderTalismans++;
+    			cf.writeIntConfig("spider", "talisman", lc.spiderTalismans);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (Digested Mosquito)")) {
+    			spiderRNG = true;
+    			lc.spiderMosquitos++;
+    			cf.writeIntConfig("spider", "mosquito", lc.spiderMosquitos);
+    		}
+
+    		// Zombie
+    		if (message.contains("Talk to Maddox to claim your Zombie Slayer XP!")) {
+    			lc.zombieRevs++;
+    			cf.writeIntConfig("zombie", "revs", lc.zombieRevs);
+    		}
+    		// I couldn't find a pic of someone getting this drop, so I'm assuming this works
+    		if (message.contains("VERY RARE DROP! (Revenant Catalyst)")) {
+    			lc.zombieRevCatas++;
+    			cf.writeIntConfig("zombie", "revCatalyst", lc.zombieRevCatas);
+    		}
+    		if (message.contains("VERY RARE DROP! (◆ Pestilence Rune")) {
+    			lc.zombiePestilences++;
+    			cf.writeIntConfig("zombie", "pestilence", lc.zombiePestilences);
+    		}
+    		if (message.contains("VERY RARE DROP! (Undead Catalyst)")) {
+    			lc.zombieUndeadCatas++;
+    			cf.writeIntConfig("zombie", "undeadCatalyst", lc.zombieUndeadCatas);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (Beheaded Horror)")) {
+    			zombieRNG = true;
+    			lc.zombieBeheadeds++;
+    			cf.writeIntConfig("zombie", "beheaded", lc.zombieBeheadeds);
+    		}
+
+    		if (message.contains("CRAZY RARE DROP! (◆ Snake Rune")) {
+    			zombieRNG = true;
+    			lc.zombieSnakes++;
+    			cf.writeIntConfig("zombie", "snake", lc.zombieSnakes);
+    		}
+    		if (message.contains("CRAZY RARE DROP! (Scythe Blade)")) {
+    			zombieRNG = true;
+    			lc.zombieScythes++;
+    			cf.writeIntConfig("zombie", "scythe", lc.zombieScythes);
+    		}
+
+    		// Time is stored in seconds, so if Skyblock
+    		// survives until 2038, I'll just update it then
+    		if (wolfRNG) {
+    			lc.wolfTime = (int) System.currentTimeMillis() / 1000;
+    			lc.wolfBosses = 0;
+    			cf.writeIntConfig("wolf", "timeRNG", lc.wolfTime);
+    			cf.writeIntConfig("wolf", "bossRNG", 0);
+    		} else {
+    			if (lc.wolfBosses != -1) {
+    				lc.wolfBosses++;
+    			}
+    			cf.writeIntConfig("wolf", "bossRNG", lc.wolfBosses);
+    		}
+    		if (spiderRNG) {
+    			lc.spiderTime = (int) System.currentTimeMillis() / 1000;
+    			lc.spiderBosses = 0;
+    			cf.writeIntConfig("spider", "timeRNG", lc.spiderTime);
+    			cf.writeIntConfig("spider", "bossRNG", 0);
+    		} else {
+    			if (lc.spiderBosses != -1) {
+    				lc.spiderBosses++;
+    			}
+    			cf.writeIntConfig("spider", "bossRNG", lc.spiderBosses);
+    		}
+    		if (zombieRNG) {
+    			lc.zombieTime = (int) System.currentTimeMillis() / 1000;
+    			lc.zombieBosses = 0;
+    			cf.writeIntConfig("zombie", "timeRNG", lc.zombieTime);
+    			cf.writeIntConfig("zombie", "bossRNG", 0);
+    		} else {
+    			if (lc.zombieBosses != -1) {
+    				lc.zombieBosses++;
+    			}
+    			cf.writeIntConfig("wolf", "bossRNG", lc.zombieBosses);
+    		}
+    	}	
+    }
+    
+    @SubscribeEvent
+    public void renderPlayerInfo(final RenderGameOverlayEvent.Post event) {
+    	if (event.type != RenderGameOverlayEvent.ElementType.EXPERIENCE) return;
+    	final ToggleCommand tc = new ToggleCommand();
+    	final boolean isCoordsToggled = tc.getToggle("coords");
+    	
+    	if (isCoordsToggled) {
+    		ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft());
+    		EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+    		
+        	double xDir = (player.rotationYaw % 360 + 360) % 360;
+        	if (xDir > 180) xDir -= 360;
+        	xDir = (double) Math.round(xDir * 10d) / 10d;
+        	double yDir = (double) Math.round(player.rotationPitch * 10d) / 10d;
+        	
+        	String coordText = (int) player.posX + " / " + (int) player.posY + " / " + (int) player.posZ + " (" + xDir + " / " + yDir + ")";
+        	int height = scaled.getScaledHeight();
+        	new TextRenderer(Minecraft.getMinecraft(), coordText, 5, height - 25, Integer.parseInt("FFFFFF", 16));
+    	}
+    	
+    	final DisplayCommand ds = new DisplayCommand();
+    	final String displayToggle = ds.display;
+    	
+    	if (!displayToggle.equals("off")) {
+    		final LootCommand lc = new LootCommand();
+    		String dropsText = "";
+    		String countText = "";
+    		String timeBetween = "Never";
+    		String bossesBetween = "Never";
+    		int timeNow = (int) System.currentTimeMillis() / 1000;
+    		
+    		if (displayToggle.equals("wolf")) {
+    			if (lc.wolfTime == -1) {
+    				timeBetween = "Never";
+    			} else {
+    				timeBetween = lc.getTimeBetween(lc.wolfTime, timeNow);
+    			}
+    			if (lc.wolfBosses == -1) {
+    				bossesBetween = "Never";
+    			} else {
+    				bossesBetween = Integer.toString(lc.wolfBosses);
+    			}
+    			
+    			dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
+							EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
+							EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
+							EnumChatFormatting.AQUA + "Spirit Runes:\n" + 
+							EnumChatFormatting.WHITE + "Critical VI Books:\n" +
+							EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
+							EnumChatFormatting.GOLD + "Couture Runes:\n" +
+							EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
+							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+							EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
+    			countText = EnumChatFormatting.GOLD + "" + lc.wolfSvens + "\n" +
+							EnumChatFormatting.GREEN + lc.wolfTeeth + "\n" +
+							EnumChatFormatting.BLUE + lc.wolfWheels + "\n" +
+							EnumChatFormatting.AQUA + lc.wolfSpirits + "\n" + 
+							EnumChatFormatting.WHITE + lc.wolfBooks + "\n" +
+							EnumChatFormatting.DARK_RED + lc.wolfEggs + "\n" +
+							EnumChatFormatting.GOLD + lc.wolfCoutures + "\n" +
+							EnumChatFormatting.AQUA + lc.wolfBaits + "\n" +
+							EnumChatFormatting.DARK_PURPLE + lc.wolfFluxes + "\n" +
+							EnumChatFormatting.AQUA + timeBetween + "\n" +
+							EnumChatFormatting.AQUA + bossesBetween + "\n";
+    		} else if (displayToggle.equals("spider")) {
+    			if (lc.spiderTime == -1) {
+    				timeBetween = "Never";
+    			} else {
+    				timeBetween = lc.getTimeBetween(lc.spiderTime, timeNow);
+    			}
+    			if (lc.spiderBosses == -1) {
+    				bossesBetween = "Never";
+    			} else {
+    				bossesBetween = Integer.toString(lc.spiderBosses);
+    			}
+    			
+    			dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
+							EnumChatFormatting.GREEN + "Tarantula Webs:\n" +
+							EnumChatFormatting.DARK_GREEN + "Arrow Poison:\n" +
+							EnumChatFormatting.DARK_GRAY + "Bite Runes:\n" + 
+							EnumChatFormatting.WHITE + "Bane VI Books:\n" +
+							EnumChatFormatting.AQUA + "Spider Catalysts:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Tarantula Talismans:\n" +
+							EnumChatFormatting.LIGHT_PURPLE + "Fly Swatters:\n" +
+							EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
+							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+							EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
+    			countText = EnumChatFormatting.GOLD + "" + lc.spiderTarantulas + "\n" +
+							EnumChatFormatting.GREEN + lc.spiderWebs + "\n" +
+							EnumChatFormatting.DARK_GREEN + lc.spiderTAP + "\n" +
+							EnumChatFormatting.DARK_GRAY + lc.spiderBites + "\n" + 
+							EnumChatFormatting.WHITE + lc.spiderBooks + "\n" +
+							EnumChatFormatting.AQUA + lc.spiderCatalysts + "\n" +
+							EnumChatFormatting.DARK_PURPLE + lc.spiderTalismans + "\n" +
+							EnumChatFormatting.LIGHT_PURPLE + lc.spiderSwatters + "\n" +
+							EnumChatFormatting.GOLD + lc.spiderMosquitos + "\n" +
+							EnumChatFormatting.AQUA + timeBetween + "\n" +
+							EnumChatFormatting.AQUA + bossesBetween + "\n";
+    		} else {
+    			// Zombie
+    			dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
+							EnumChatFormatting.GREEN + "Revenant Flesh:\n" +
+							EnumChatFormatting.BLUE + "Foul Flesh:\n" +
+							EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" + 
+							EnumChatFormatting.WHITE + "Smite VI Books:\n" +
+							EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
+							EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
+							EnumChatFormatting.RED + "Revenant Catalysts:\n" +
+							EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
+							EnumChatFormatting.GOLD + "Scythe Blades:\n" +
+							EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+							EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
+    			countText = EnumChatFormatting.GOLD + "" + lc.zombieRevs + "\n" +
+							EnumChatFormatting.GREEN + lc.zombieRevFlesh + "\n" +
+							EnumChatFormatting.BLUE + lc.zombieFoulFlesh + "\n" +
+							EnumChatFormatting.DARK_GREEN + lc.zombiePestilences + "\n" + 
+							EnumChatFormatting.WHITE + lc.zombieBooks + "\n" +
+							EnumChatFormatting.AQUA + lc.zombieUndeadCatas + "\n" +
+							EnumChatFormatting.DARK_PURPLE + lc.zombieBeheadeds + "\n" +
+							EnumChatFormatting.RED + lc.zombieRevCatas + "\n" +
+							EnumChatFormatting.DARK_GREEN + lc.zombieSnakes + "\n" +
+							EnumChatFormatting.GOLD + lc.zombieScythes + "\n" +
+							EnumChatFormatting.AQUA + timeBetween + "\n" +
+							EnumChatFormatting.AQUA + bossesBetween + "\n";
+    		}
+    		new TextRenderer(Minecraft.getMinecraft(), dropsText, 80, 5, Integer.parseInt("FFFFFF", 16));
+    		new TextRenderer(Minecraft.getMinecraft(), countText, 190, 5, Integer.parseInt("FFFFFF", 16));
+    	}
+    }
+    
+    @SubscribeEvent
+    public void onSound(final PlaySoundEvent event) {
+    	if (event.name.equals("note.pling")) {
+    		// Don't check twice within 5 seconds 
+    		checkItemsNow = (int) System.currentTimeMillis() / 1000;
+    		if (checkItemsNow - itemsChecked <= 5) return;
+    		
+    		final ScoreboardHandler sc = new ScoreboardHandler();
+    		List<String> scoreboard = sc.getSidebarLines();
+    		
+    		for (String line : scoreboard) {
+    			String cleanedLine = sc.cleanSB(line);
+    			if (cleanedLine.contains("Boss slain!")) {
+    				final LootCommand lc = new LootCommand();
+    				final ConfigHandler cf = new ConfigHandler();
+    				
+    				itemsChecked = (int) System.currentTimeMillis() / 1000;
+    				
+    				lc.wolfTeeth += getItems("Wolf Teeth");
+        			lc.wolfWheels += getItems("Hamster Wheel");
+        			lc.spiderWebs += getItems("Tarantula Web");
+        			lc.spiderTAP += getItems("Toxic Arrow Poison");
+        			lc.zombieRevFlesh += getItems("Revenant Flesh");
+        			lc.zombieFoulFlesh += getItems("Foul Flesh");
+        			
+        			cf.writeIntConfig("wolf", "teeth", lc.wolfTeeth);
+        			cf.writeIntConfig("wolf", "wheel", lc.wolfWheels);
+        			cf.writeIntConfig("spider", "web", lc.spiderWebs);
+        			cf.writeIntConfig("spider", "tap", lc.spiderTAP);
+        			cf.writeIntConfig("zombie", "revFlesh", lc.zombieRevFlesh);
+        			cf.writeIntConfig("zombie", "foulFlesh", lc.zombieFoulFlesh);
+    			}
+    		}
+    	}
+    }
+    
+    public int getItems(String item) {
+    	Minecraft mc = Minecraft.getMinecraft();
+    	EntityPlayer player = mc.thePlayer;
+    	
+    	double x = player.posX;
+    	double y = player.posY;
+    	double z = player.posZ;
+    	AxisAlignedBB scan = new AxisAlignedBB(x - 6, y - 6, z - 6, x + 6, y + 6, z + 6);
+    	List<EntityItem> items = mc.theWorld.getEntitiesWithinAABB(EntityItem.class, scan);
+    	
+    	for (EntityItem i : items) {
+    		String itemName = StringUtils.stripControlCodes(i.getEntityItem().getDisplayName());
+    		if (itemName.equals(item)) return i.getEntityItem().stackSize;
+    	}
+    	// No items found
+    	return 0;
+    }
+    
+}
diff --git a/Danker/commands/DisplayCommand.java b/Danker/commands/DisplayCommand.java
new file mode 100644
index 0000000..534ce16
--- /dev/null
+++ b/Danker/commands/DisplayCommand.java
@@ -0,0 +1,55 @@
+package me.Danker.commands;
+
+import me.Danker.handlers.ConfigHandler;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentText;
+
+public class DisplayCommand extends CommandBase {
+	public static String display;
+
+	@Override
+	public String getCommandName() {
+		return "display";
+	}
+
+	@Override
+	public String getCommandUsage(ICommandSender arg0) {
+		return getCommandName() + " [zombie/spider/wolf/off]";
+	}
+
+	@Override
+	public int getRequiredPermissionLevel() {
+		return 0;
+	}
+	
+	@Override
+	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+		final EntityPlayer player = (EntityPlayer) arg0;
+		
+		if (arg1.length == 0) {
+			player.addChatMessage(new ChatComponentText("Usage: /display [zombie/spider/wolf/off]"));
+			return;
+		}
+		
+		final ConfigHandler cf = new ConfigHandler();
+		
+		if (arg1[0].equalsIgnoreCase("wolf")) {
+			display = "wolf";
+		} else if (arg1[0].equalsIgnoreCase("spider")) {
+			display = "spider";
+		} else if (arg1[0].equalsIgnoreCase("zombie")) {
+			display = "zombie";
+		} else if (arg1[0].equalsIgnoreCase("off")) {
+			display = "off";
+		} else {
+			player.addChatMessage(new ChatComponentText("Usage: /display [zombie/spider/wolf/off]"));
+			return;
+		}
+		player.addChatMessage(new ChatComponentText("Display set to " + display + "."));
+		cf.writeStringConfig("misc", "display", display);
+	}
+
+}
diff --git a/me/Danker/GetkeyCommand.java b/Danker/commands/GetkeyCommand.java
index fcbe133..e8b29e6 100644
--- a/me/Danker/GetkeyCommand.java
+++ b/Danker/commands/GetkeyCommand.java
@@ -1,39 +1,40 @@
-package me.Danker;

-

-import net.minecraft.command.CommandBase;

-import net.minecraft.command.CommandException;

-import net.minecraft.command.ICommand;

-import net.minecraft.command.ICommandSender;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.util.ChatComponentText;

-

-public class GetkeyCommand extends CommandBase implements ICommand {

-

-	@Override

-	public String getCommandName() {

-		return "getkey";

-	}

-

-	@Override

-	public String getCommandUsage(ICommandSender arg0) {

-		return getCommandName();

-	}

-	

-	@Override

-	public int getRequiredPermissionLevel() {

-		return 0;

-	}

-

-	@Override

-	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {

-		final EntityPlayer player = (EntityPlayer)arg0;

-		final ConfigHandler cf = new ConfigHandler();

-		

-		if (cf.getString("api", "APIKey").equals("")) {

-			player.addChatMessage(new ChatComponentText("API key not set. Set your API key using /setkey."));

-		} else {

-			player.addChatMessage(new ChatComponentText("Your set API key is " + cf.getString("api", "APIKey")));

-		}

-	}

-

-}

+package me.Danker.commands;
+
+import me.Danker.handlers.ConfigHandler;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentText;
+
+public class GetkeyCommand extends CommandBase implements ICommand {
+
+	@Override
+	public String getCommandName() {
+		return "getkey";
+	}
+
+	@Override
+	public String getCommandUsage(ICommandSender arg0) {
+		return getCommandName();
+	}
+	
+	@Override
+	public int getRequiredPermissionLevel() {
+		return 0;
+	}
+
+	@Override
+	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
+		final EntityPlayer player = (EntityPlayer)arg0;
+		final ConfigHandler cf = new ConfigHandler();
+		
+		if (cf.getString("api", "APIKey").equals("")) {
+			player.addChatMessage(new ChatComponentText("API key not set. Set your API key using /setkey."));
+		} else {
+			player.addChatMessage(new ChatComponentText("Your set API key is " + cf.getString("api", "APIKey")));
+		}
+	}
+
+}
diff --git a/me/Danker/LootCommand.java b/Danker/commands/LootCommand.java
index f4970ff..4b05d25 100644
--- a/me/Danker/LootCommand.java
+++ b/Danker/commands/LootCommand.java
@@ -1,180 +1,192 @@
-package me.Danker;

-

-import java.util.List;

-

-import net.minecraft.command.CommandBase;

-import net.minecraft.command.CommandException;

-import net.minecraft.command.ICommandSender;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-

-public class LootCommand extends CommandBase {

-	// Wolf

-	public static int wolfSvens;

-	public static int wolfSpirits;

-	public static int wolfBooks;

-	public static int wolfEggs;

-	public static int wolfCoutures;

-	public static int wolfBaits;

-	public static int wolfFluxes;

-	public static int wolfTime;

-	public static int wolfBosses;

-	// Spider

-	public static int spiderTarantulas;

-	public static int spiderBites;

-	public static int spiderCatalysts;

-	public static int spiderBooks;

-	public static int spiderSwatters;

-	public static int spiderTalismans;

-	public static int spiderMosquitos;

-	public static int spiderTime;

-	public static int spiderBosses;

-	// Zombie

-	public static int zombieRevs;

-	public static int zombiePestilences;

-	public static int zombieUndeadCatas;

-	public static int zombieBooks;

-	public static int zombieBeheadeds;

-	public static int zombieRevCatas;

-	public static int zombieSnakes;

-	public static int zombieScythes;

-	public static int zombieTime;

-	public static int zombieBosses;

-	

-	public String getTimeBetween(int timeOne, int timeTwo) {

-		int secondsBetween = timeTwo - timeOne;

-		

-		String timeFormatted = "";

-		int days;

-		int hours;

-		int minutes;

-		int seconds;

-		

-		if (secondsBetween > 86400) {

-			// More than 1d, display #d#h

-			days = secondsBetween / 86400;

-			hours = secondsBetween % 86400 / 3600;

-			timeFormatted = days + "d" + hours + "h";

-		} else if (secondsBetween > 3600) {

-			// More than 1h, display #h#m

-			hours = secondsBetween / 3600;

-			minutes = secondsBetween % 3600 / 60;

-			timeFormatted = hours + "h" + minutes + "m";

-		} else {

-			// Display #m#s

-			minutes = secondsBetween / 60;

-			seconds = secondsBetween % 60;

-			timeFormatted = minutes + "m" + seconds + "s";

-		}

-		

-		return timeFormatted;

-	}

-	

-	@Override

-	public String getCommandName() {

-		return "loot";

-	}

-

-	@Override

-	public String getCommandUsage(ICommandSender arg0) {

-		return getCommandName() + " [wolf/spider/zombie]";

-	}

-	

-	@Override

-	public int getRequiredPermissionLevel() {

-		return 0;

-	}

-

-	@Override

-	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {

-		final EntityPlayer player = (EntityPlayer)arg0;

-		

-		if (arg1.length == 0) {

-			player.addChatMessage(new ChatComponentText("Usage: /loot [wolf/spider/zombie]"));

-			return;

-		}

-		

-		int timeNow = (int) System.currentTimeMillis() / 1000;

-		String timeBetween;

-		String bossesBetween;

-		if (arg1[0].equalsIgnoreCase("wolf")) {

-			if (wolfTime == -1) {

-				timeBetween = "Never";

-			} else {

-				timeBetween = getTimeBetween(wolfTime, timeNow);

-			}

-			if (wolfBosses == -1) {

-				bossesBetween = "Never";

-			} else {

-				bossesBetween = Integer.toString(wolfBosses);

-			}

-			

-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + "-------------------\n" +

-														EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.BOLD + "  Sven Loot Summary:\n" +

-														EnumChatFormatting.GOLD + "    Svens Killed: " + wolfSvens + "\n" +

-														EnumChatFormatting.AQUA + "    Spirit Runes: " + wolfSpirits + "\n" + 

-														EnumChatFormatting.WHITE + "    Critical VI Books: " + wolfBooks + "\n" +

-														EnumChatFormatting.DARK_RED + "    Red Claw Eggs: " + wolfEggs + "\n" +

-														EnumChatFormatting.GOLD + "    Couture Runes: " + wolfCoutures + "\n" +

-														EnumChatFormatting.AQUA + "    Grizzly Baits: " + wolfBaits + "\n" +

-														EnumChatFormatting.DARK_PURPLE + "    Overfluxes: " + wolfFluxes + "\n" +

-														EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +

-														EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +

-														EnumChatFormatting.AQUA + "" + EnumChatFormatting.BOLD + " -------------------"));

-		} else if (arg1[0].equalsIgnoreCase("spider")) {

-			if (spiderTime == -1) {

-				timeBetween = "Never";

-			} else {

-				timeBetween = getTimeBetween(spiderTime, timeNow);

-			}

-			if (spiderBosses == -1) {

-				bossesBetween = "Never";

-			} else {

-				bossesBetween = Integer.toString(spiderBosses);

-			}

-			

-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + "-------------------\n" +

-														EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "  Spider Loot Summary:\n" +

-														EnumChatFormatting.GOLD + "    Tarantulas Killed: " + spiderTarantulas + "\n" +

-														EnumChatFormatting.DARK_GRAY + "    Bite Runes: " + spiderBites + "\n" + 

-														EnumChatFormatting.WHITE + "    Bane VI Books: " + spiderBooks + "\n" +

-														EnumChatFormatting.AQUA + "    Spider Catalysts: " + spiderCatalysts + "\n" +

-														EnumChatFormatting.DARK_PURPLE + "    Tarantula Talismans: " + spiderTalismans + "\n" +

-														EnumChatFormatting.LIGHT_PURPLE + "    Fly Swatters: " + spiderSwatters + "\n" +

-														EnumChatFormatting.GOLD + "    Digested Mosquitos: " + spiderMosquitos + "\n" +

-														EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +

-														EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +

-														EnumChatFormatting.RED + "" + EnumChatFormatting.BOLD + " -------------------"));

-		} else if (arg1[0].equalsIgnoreCase("zombie")) {

-			if (zombieTime == -1) {

-				timeBetween = "Never";

-			} else {

-				timeBetween = getTimeBetween(zombieTime, timeNow);

-			}

-			if (zombieBosses == -1) {

-				bossesBetween = "Never";

-			} else {

-				bossesBetween = Integer.toString(zombieBosses);

-			}

-			

-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + "-------------------\n" +

-														EnumChatFormatting.DARK_GREEN + "" + EnumChatFormatting.BOLD + "  Zombie Loot Summary:\n" +

-														EnumChatFormatting.GOLD + "    Revs Killed: " + zombieRevs + "\n" +

-														EnumChatFormatting.DARK_GREEN + "    Pestilence Runes: " + zombiePestilences + "\n" + 

-														EnumChatFormatting.WHITE + "    Smite VI Books: " + zombieBooks + "\n" +

-														EnumChatFormatting.AQUA + "    Undead Catalysts: " + zombieUndeadCatas + "\n" +

-														EnumChatFormatting.DARK_PURPLE + "    Beheaded Horrors: " + zombieBeheadeds + "\n" +

-														EnumChatFormatting.RED + "    Revenant Catalysts: " + zombieRevCatas + "\n" +

-														EnumChatFormatting.DARK_GREEN + "    Snake Runes: " + zombieSnakes + "\n" +

-														EnumChatFormatting.GOLD + "    Scythe Blades: " + zombieScythes + "\n" +

-														EnumChatFormatting.AQUA + "    Time Since RNG: " + timeBetween + "\n" +

-														EnumChatFormatting.AQUA + "    Bosses Since RNG: " + bossesBetween + "\n" +

-														EnumChatFormatting.GREEN + "" + EnumChatFormatting.BOLD + " -------------------"));

-		} else {

-			player.addChatMessage(new ChatComponentText("Usage: /loot [wolf/spider/zombie]"));

-		}

-

-	}

-

-}

+package me.Danker.commands;
+
+import java.util.List;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class LootCommand extends CommandBase {
+	// Wolf
+	public static int wolfSvens;
+	public static int wolfTeeth;
+	public static int wolfWheels;
+	public static int wolfSpirits;
+	public static int wolfBooks;
+	public static int wolfEggs;
+	public static int wolfCoutures;
+	public static int wolfBaits;
+	public static int wolfFluxes;
+	public static int wolfTime;
+	public static int wolfBosses;
+	// Spider
+	public static int spiderTarantulas;
+	public static int spiderWebs;
+	public static int spiderTAP;
+	public static int spiderBites;
+	public static int spiderCatalysts;
+	public static int spiderBooks;
+	public static int spiderSwatters;
+	public static int spiderTalismans;
+	public static int spiderMosquitos;
+	public static int spiderTime;
+	public static int spiderBosses;
+	// Zombie
+	public static int zombieRevs;
+	public static int zombieRevFlesh;
+	public static int zombieFoulFlesh;
+	public static int zombiePestilences;
+	public static int zombieUndeadCatas;
+	public static int zombieBooks;
+	public static int zombieBeheadeds;
+	public static int zombieRevCatas;
+	public static int zombieSnakes;
+	public static int zombieScythes;
+	public static int zombieTime;
+	public static int zombieBosses;
+	
+	public String getTimeBetween(int timeOne, int timeTwo) {
+		int secondsBetween = timeTwo - timeOne;
+		
+		String timeFormatted = "";
+		int days;
+		int hours;
+		int minutes;
+		int seconds;
+		
+		if (secondsBetween > 86400) {
+			// More than 1d, display #d#h
+			days = secondsBetween / 86400;
+			hours = secondsBetween % 86400 / 3600;
+			timeFormatted = days + "d" + hours + "h";
+		} else if (secondsBetween > 3600) {
+			// More than 1h, display #h#m
+			hours = secondsBetween / 3600;
+			minutes = secondsBetween % 3600 / 60;
+			timeFormatted = hours + "h" + minutes + "m";
+		} else {
+			// Display #m#s
+			minutes = secondsBetween / 60;
+			seconds = secondsBetween % 60;
+			timeFormatted = minutes + "m" + seconds + "s";
+		}
+		
+		return timeFormatted;
+	}
+	
+	@Override