NeuEventListener changes and dead code removal (#88)

* hide Hypixel reforge stats

* unused import?

* better comments

* 2.1.md 🙂

* 2.1.md 🙂

* minor cleanup

* api

* remove collectionLog and morus and cape.png

* remove FancyPortals and panorama dev cmd

Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>

32 files changed, 3135 insertions, 4968 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUApi.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUApi.java
index d83035d0..feb18c66 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUApi.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUApi.java
@@ -3,7 +3,7 @@ package io.github.moulberry.notenoughupdates;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 
 public class NEUApi {
-	static boolean disableInventoryButtons = false;
+	public static boolean disableInventoryButtons = false;
 
 	public static void setInventoryButtonsToDisabled() {
 		disableInventoryButtons = true;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
deleted file mode 100644
index 84289e34..00000000
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
+++ /dev/null
@@ -1,2842 +0,0 @@
-package io.github.moulberry.notenoughupdates;
-
-import com.google.common.collect.Lists;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.minecraft.MinecraftProfileTexture;
-import io.github.moulberry.notenoughupdates.auction.CustomAHGui;
-import io.github.moulberry.notenoughupdates.commands.profile.ViewProfileCommand;
-import io.github.moulberry.notenoughupdates.core.BackgroundBlur;
-import io.github.moulberry.notenoughupdates.core.GuiScreenElementWrapper;
-import io.github.moulberry.notenoughupdates.core.util.MiscUtils;
-import io.github.moulberry.notenoughupdates.core.util.render.RenderUtils;
-import io.github.moulberry.notenoughupdates.cosmetics.CapeManager;
-import io.github.moulberry.notenoughupdates.dungeons.DungeonBlocks;
-import io.github.moulberry.notenoughupdates.dungeons.DungeonWin;
-import io.github.moulberry.notenoughupdates.miscfeatures.*;
-import io.github.moulberry.notenoughupdates.miscgui.*;
-import io.github.moulberry.notenoughupdates.options.NEUConfig;
-import io.github.moulberry.notenoughupdates.overlays.*;
-import io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer;
-import io.github.moulberry.notenoughupdates.util.*;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.*;
-import net.minecraft.client.gui.inventory.GuiChest;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiEditSign;
-import net.minecraft.client.gui.inventory.GuiInventory;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.event.ClickEvent;
-import net.minecraft.init.Items;
-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.nbt.NBTTagList;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.util.*;
-import net.minecraftforge.client.ClientCommandHandler;
-import net.minecraftforge.client.event.*;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
-import net.minecraftforge.event.world.WorldEvent;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import org.apache.commons.lang3.text.WordUtils;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.io.File;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.util.List;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static io.github.moulberry.notenoughupdates.overlays.SlayerOverlay.*;
-import static io.github.moulberry.notenoughupdates.util.GuiTextures.dungeon_chest_worth;
-
-public class NEUEventListener {
-
-	private final NotEnoughUpdates neu;
-
-	private boolean hoverInv = false;
-	private boolean focusInv = false;
-
-	private boolean joinedSB = false;
-
-	public NEUEventListener(NotEnoughUpdates neu) {
-		this.neu = neu;
-	}
-
-	private void displayUpdateMessageIfOutOfDate() {
-		File repo = neu.manager.repoLocation;
-		if (repo.exists()) {
-			File updateJson = new File(repo, "update.json");
-			try {
-				JsonObject o = neu.manager.getJsonFromFile(updateJson);
-
-				String version = o.get("version").getAsString();
-				String preVersion = o.get("pre_version").getAsString();
-
-				boolean shouldUpdate = !NotEnoughUpdates.VERSION.equalsIgnoreCase(version);
-				boolean shouldPreUpdate = !NotEnoughUpdates.PRE_VERSION.equalsIgnoreCase(preVersion);
-
-				if (o.has("version_id") && o.get("version_id").isJsonPrimitive()) {
-					int version_id = o.get("version_id").getAsInt();
-					shouldUpdate = version_id > NotEnoughUpdates.VERSION_ID;
-				}
-				if (o.has("pre_version_id") && o.get("pre_version_id").isJsonPrimitive()) {
-					int pre_version_id = o.get("pre_version_id").getAsInt();
-					shouldPreUpdate = pre_version_id > NotEnoughUpdates.PRE_VERSION_ID;
-				}
-
-				if (shouldUpdate) {
-					String update_msg = o.get("update_msg").getAsString();
-
-					int first_len = -1;
-					for (String line : update_msg.split("\n")) {
-						FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
-						int len = fr.getStringWidth(line);
-						if (first_len == -1) {
-							first_len = len;
-						}
-						int missing_len = first_len - len;
-						if (missing_len > 0) {
-							StringBuilder sb = new StringBuilder(line);
-							for (int i = 0; i < missing_len / 8; i++) {
-								sb.insert(0, " ");
-							}
-							line = sb.toString();
-						}
-						line = line.replaceAll("\\{version}", version);
-						Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(line));
-					}
-
-					neu.displayLinks(o);
-
-					Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-				} else if (shouldPreUpdate && NotEnoughUpdates.VERSION_ID == o.get("version").getAsInt()) {
-					String pre_update_msg = o.get("pre_update_msg").getAsString();
-
-					int first_len = -1;
-					for (String line : pre_update_msg.split("\n")) {
-						FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
-						int len = fr.getStringWidth(line);
-						if (first_len == -1) {
-							first_len = len;
-						}
-						int missing_len = first_len - len;
-						if (missing_len > 0) {
-							StringBuilder sb = new StringBuilder(line);
-							for (int i = 0; i < missing_len / 8; i++) {
-								sb.insert(0, " ");
-							}
-							line = sb.toString();
-						}
-						line = line.replaceAll("\\{pre_version}", preVersion);
-						Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(line));
-					}
-
-					neu.displayLinks(o);
-
-					Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-				}
-			} catch (Exception ignored) {
-			}
-		}
-	}
-
-	@SubscribeEvent
-	public void onWorldLoad(WorldEvent.Unload event) {
-		NotEnoughUpdates.INSTANCE.saveConfig();
-		CrystalMetalDetectorSolver.reset(false);
-	}
-
-	private static long notificationDisplayMillis = 0;
-	private static List<String> notificationLines = null;
-	private static boolean showNotificationOverInv = false;
-
-	private static final Pattern BAD_ITEM_REGEX = Pattern.compile("x[0-9]{1,2}$");
-	private static final Pattern SLAYER_XP =
-		Pattern.compile("   (Spider|Zombie|Wolf|Enderman) Slayer LVL (\\d) - (?:Next LVL in ([\\d,]+) XP!|LVL MAXED OUT!)");
-
-	/**
-	 * 1)Will send the cached message from #sendChatMessage when at least 200ms has passed since the last message.
-	 * This is used in order to prevent the mod spamming messages.
-	 * 2)Adds unique items to the collection log
-	 */
-	private boolean preloadedItems = false;
-	private long lastLongUpdate = 0;
-	private long lastSkyblockScoreboard = 0;
-
-	private final ExecutorService itemPreloader = Executors.newFixedThreadPool(10);
-	private final List<ItemStack> toPreload = new ArrayList<>();
-
-	private int inventoryLoadedTicks = 0;
-	private String loadedInvName = "";
-	public static boolean inventoryLoaded = false;
-
-	public static void displayNotification(List<String> lines, boolean showForever) {
-		displayNotification(lines, showForever, false);
-	}
-
-	public static void displayNotification(List<String> lines, boolean showForever, boolean overInventory) {
-		if (showForever) {
-			notificationDisplayMillis = -420;
-		} else {
-			notificationDisplayMillis = System.currentTimeMillis();
-		}
-		notificationLines = lines;
-		showNotificationOverInv = overInventory;
-	}
-
-	@SubscribeEvent
-	public void onTick(TickEvent.ClientTickEvent event) {
-		Keyboard.enableRepeatEvents(
-			Minecraft.getMinecraft().currentScreen != null && (Minecraft.getMinecraft().currentScreen instanceof GuiChat
-				|| Minecraft.getMinecraft().currentScreen instanceof GuiEditSign ||
-				Minecraft.getMinecraft().currentScreen instanceof GuiScreenBook));
-		if (event.phase != TickEvent.Phase.START) return;
-		if (Minecraft.getMinecraft().theWorld == null) return;
-		if (Minecraft.getMinecraft().thePlayer == null) return;
-
-		if (Minecraft.getMinecraft().currentScreen instanceof GuiChest) {
-			GuiChest chest = (GuiChest) Minecraft.getMinecraft().currentScreen;
-			ContainerChest cc = (ContainerChest) chest.inventorySlots;
-
-			if (!loadedInvName.equals(cc.getLowerChestInventory().getDisplayName().getUnformattedText())) {
-				loadedInvName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
-				inventoryLoaded = false;
-				inventoryLoadedTicks = 3;
-			}
-
-			if (!inventoryLoaded) {
-				if (cc.getLowerChestInventory().getStackInSlot(cc.getLowerChestInventory().getSizeInventory() - 1) != null) {
-					inventoryLoaded = true;
-				} else {
-					for (ItemStack stack : chest.inventorySlots.getInventory()) {
-						if (stack != null) {
-							if (--inventoryLoadedTicks <= 0) {
-								inventoryLoaded = true;
-							}
-							break;
-						}
-					}
-				}
-			}
-		} else {
-			inventoryLoaded = false;
-			inventoryLoadedTicks = 3;
-		}
-
-		if ((Keyboard.isKeyDown(Keyboard.KEY_NUMPAD1) && Keyboard.isKeyDown(Keyboard.KEY_NUMPAD4) &&
-			Keyboard.isKeyDown(Keyboard.KEY_NUMPAD9))) {
-			ChatComponentText component = new ChatComponentText("\u00a7cYou are permanently banned from this server!");
-			component.appendText("\n");
-			component.appendText("\n\u00a77Reason: \u00a7rSuspicious account activity/Other");
-			component.appendText("\n\u00a77Find out more: \u00a7b\u00a7nhttps://www.hypixel.net/appeal");
-			component.appendText("\n");
-			component.appendText("\n\u00a77Ban ID: \u00a7r#49871982");
-			component.appendText("\n\u00a77Sharing your Ban ID may affect the processing of your appeal!");
-			Minecraft.getMinecraft().getNetHandler().getNetworkManager().closeChannel(component);
-			return;
-		}
-
-		if (neu.hasSkyblockScoreboard()) {
-			if (!preloadedItems) {
-				preloadedItems = true;
-				List<JsonObject> list = new ArrayList<>(neu.manager.getItemInformation().values());
-				for (JsonObject json : list) {
-					itemPreloader.submit(() -> {
-						ItemStack stack = neu.manager.jsonToStack(json, true, true);
-						if (stack.getItem() == Items.skull) toPreload.add(stack);
-					});
-				}
-			} else if (!toPreload.isEmpty()) {
-				Utils.drawItemStack(toPreload.get(0), -100, -100);
-				toPreload.remove(0);
-			} else {
-				itemPreloader.shutdown();
-			}
-
-			for (TextOverlay overlay : OverlayManager.textOverlays) {
-				overlay.shouldUpdateFrequent = true;
-			}
-		}
-
-		boolean longUpdate = false;
-		long currentTime = System.currentTimeMillis();
-		if (currentTime - lastLongUpdate > 1000) {
-			longUpdate = true;
-			lastLongUpdate = currentTime;
-		}
-		if (!NotEnoughUpdates.INSTANCE.config.dungeons.slowDungeonBlocks) {
-			DungeonBlocks.tick();
-		}
-		DungeonWin.tick();
-
-		String containerName = null;
-		if (Minecraft.getMinecraft().currentScreen instanceof GuiChest) {
-			GuiChest eventGui = (GuiChest) Minecraft.getMinecraft().currentScreen;
-			ContainerChest cc = (ContainerChest) eventGui.inventorySlots;
-			containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
-
-			if (GuiCustomEnchant.getInstance().shouldOverride(containerName)) {
-				GuiCustomEnchant.getInstance().tick();
-			}
-		}
-
-		if (longUpdate) {
-			CrystalOverlay.tick();
-			FairySouls.tick();
-			XPInformation.getInstance().tick();
-			ProfileApiSyncer.getInstance().tick();
-			ItemCustomizeManager.tick();
-			BackgroundBlur.markDirty();
-			NPCRetexturing.getInstance().tick();
-			StorageOverlay.getInstance().markDirty();
-
-			if (neu.hasSkyblockScoreboard()) {
-				for (TextOverlay overlay : OverlayManager.textOverlays) {
-					overlay.tick();
-				}
-			}
-
-			NotEnoughUpdates.INSTANCE.overlay.redrawItems();
-			CapeManager.onTickSlow();
-
-			NotEnoughUpdates.profileViewer.putNameUuid(
-				Minecraft.getMinecraft().thePlayer.getName(),
-				Minecraft.getMinecraft().thePlayer.getUniqueID().toString().replace("-", "")
-			);
-
-			if (NotEnoughUpdates.INSTANCE.config.dungeons.slowDungeonBlocks) {
-				DungeonBlocks.tick();
-			}
-
-			if (System.currentTimeMillis() - SBInfo.getInstance().joinedWorld > 500 &&
-				System.currentTimeMillis() - SBInfo.getInstance().unloadedWorld > 500) {
-				neu.updateSkyblockScoreboard();
-			}
-			CapeManager.getInstance().tick();
-
-			if (containerName != null) {
-				if (!containerName.trim().startsWith("Accessory Bag")) {
-					AccessoryBagOverlay.resetCache();
-				}
-			} else {
-				AccessoryBagOverlay.resetCache();
-			}
-
-			if (neu.hasSkyblockScoreboard()) {
-				SBInfo.getInstance().tick();
-				lastSkyblockScoreboard = currentTime;
-				if (!joinedSB) {
-					joinedSB = true;
-
-					//SBGamemodes.loadFromFile();
-
-					if (NotEnoughUpdates.INSTANCE.config.notifications.showUpdateMsg) {
-						displayUpdateMessageIfOutOfDate();
-					}
-
-					if (NotEnoughUpdates.INSTANCE.config.notifications.doRamNotif) {
-						long maxMemoryMB = Runtime.getRuntime().maxMemory() / 1024L / 1024L;
-						if (maxMemoryMB > 4100) {
-							notificationDisplayMillis = System.currentTimeMillis();
-							notificationLines = new ArrayList<>();
-							notificationLines.add(EnumChatFormatting.GRAY + "Too much memory allocated!");
-							notificationLines.add(String.format(
-								EnumChatFormatting.DARK_GRAY + "NEU has detected %03dMB of memory allocated to Minecraft!",
-								maxMemoryMB
-							));
-							notificationLines.add(EnumChatFormatting.GRAY + "It is recommended to allocated between 2-4GB of memory");
-							notificationLines.add(
-								EnumChatFormatting.GRAY + "More than 4GB MAY cause FPS issues, EVEN if you have 16GB+ available");
-							notificationLines.add("");
-							notificationLines.add(
-								EnumChatFormatting.GRAY + "For more information, visit #ram-info in discord.gg/moulberry");
-						}
-					}
-
-					if (!NotEnoughUpdates.INSTANCE.config.hidden.loadedModBefore) {
-						NotEnoughUpdates.INSTANCE.config.hidden.loadedModBefore = true;
-						if (Constants.MISC == null || !Constants.MISC.has("featureslist")) {
-							Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-								"" + EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "WARNING: " + EnumChatFormatting.RESET +
-									EnumChatFormatting.RED + "Could not load Feature List URL from repo."));
-							Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-								"" + EnumChatFormatting.RED + "Please run " + EnumChatFormatting.BOLD + "/neuresetrepo" +
-									EnumChatFormatting.RESET + EnumChatFormatting.RED + " and " + EnumChatFormatting.BOLD +
-									"restart your game" + EnumChatFormatting.RESET + EnumChatFormatting.RED + " in order to fix. " +
-									EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "If that doesn't fix it" +
-									EnumChatFormatting.RESET + EnumChatFormatting.RED +
-									", please join discord.gg/moulberry and post in #neu-support"));
-							Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-							Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-								"" + EnumChatFormatting.GOLD + "To view the feature list after restarting type /neufeatures"));
-						} else {
-							String url = Constants.MISC.get("featureslist").getAsString();
-							Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-							Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-								EnumChatFormatting.BLUE + "It seems this is your first time using NotEnoughUpdates."));
-							ChatComponentText clickTextFeatures = new ChatComponentText(
-								EnumChatFormatting.YELLOW +
-									"Click this message if you would like to view a list of NotEnoughUpdate's Features.");
-							clickTextFeatures.setChatStyle(Utils.createClickStyle(ClickEvent.Action.OPEN_URL, url));
-							Minecraft.getMinecraft().thePlayer.addChatMessage(clickTextFeatures);
-						}
-						Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-						ChatComponentText clickTextHelp = new ChatComponentText(
-							EnumChatFormatting.YELLOW +
-								"Click this message if you would like to view a list of NotEnoughUpdate's commands.");
-						clickTextHelp.setChatStyle(Utils.createClickStyle(ClickEvent.Action.RUN_COMMAND, "/neuhelp"));
-						Minecraft.getMinecraft().thePlayer.addChatMessage(clickTextHelp);
-						Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
-					}
-				}
-			}
-			if (currentTime - lastSkyblockScoreboard < 5 * 60 * 1000) { //5 minutes
-				neu.manager.auctionManager.tick();
-			} else {
-				neu.manager.auctionManager.markNeedsUpdate();
-			}
-		}
-
-        /*if(longUpdate && neu.hasSkyblockScoreboard()) {
-            if(neu.manager.getCurrentProfile() == null || neu.manager.getCurrentProfile().length() == 0) {
-                ProfileViewer.Profile profile = NotEnoughUpdates.profileViewer.getProfile(Minecraft.getMinecraft().thePlayer.getUniqueID().toString().replace("-", ""),
-                        callback->{});
-                if(profile != null) {
-                    String latest = profile.getLatestProfile();
-                    if(latest != null) {
-                        neu.manager.setCurrentProfileBackup(profile.getLatestProfile());
-                    }
-                }
-            }*/
-            /*if(neu.manager.getCurrentProfile() != null && neu.manager.getCurrentProfile().length() > 0) {
-                HashSet<String> newItem = new HashSet<>();
-                if(Minecraft.getMinecraft().currentScreen instanceof GuiContainer &&
-                        !(Minecraft.getMinecraft().currentScreen instanceof GuiCrafting)) {
-                    boolean usableContainer = true;
-                    for(ItemStack stack : Minecraft.getMinecraft().thePlayer.openContainer.getInventory()) {
-                        if(stack == null) {
-                            continue;
-                        }
-                        if(stack.hasTagCompound()) {
-                            NBTTagCompound tag = stack.getTagCompound();
-                            if(tag.hasKey("ExtraAttributes", 10)) {
-                                continue;
-                            }
-                        }
-                        usableContainer = false;
-                        break;
-                    }
-                    if(!usableContainer) {
-                        if(Minecraft.getMinecraft().currentScreen instanceof GuiChest) {
-                            GuiChest chest = (GuiChest) Minecraft.getMinecraft().currentScreen;
-                            ContainerChest container = (ContainerChest) chest.inventorySlots;
-                            String containerName = container.getLowerChestInventory().getDisplayName().getUnformattedText();
-
-                            if(containerName.equals("Accessory Bag") || containerName.startsWith("Wardrobe")) {
-                                usableContainer = true;
-                            }
-                        }
-                    }
-                    if(usableContainer) {
-                        for(ItemStack stack : Minecraft.getMinecraft().thePlayer.inventory.mainInventory) {
-                            processUniqueStack(stack, newItem);
-                        }
-                        for(ItemStack stack : Minecraft.getMinecraft().thePlayer.openContainer.getInventory()) {
-                            processUniqueStack(stack, newItem);
-                        }
-                    }
-                } else {
-                    for(ItemStack stack : Minecraft.getMinecraft().thePlayer.inventory.mainInventory) {
-                        processUniqueStack(stack, newItem);
-                    }
-                }
-                newItemAddMap.keySet().retainAll(newItem);
-            }
-        }*/
-	}
-
-    /*private void processUniqueStack(ItemStack stack, HashSet<String> newItem) {
-        if(stack != null && stack.hasTagCompound()) {
-            String internalname = neu.manager.getInternalNameForItem(stack);
-            if(internalname != null) {
-                /*ArrayList<String> log = neu.manager.config.collectionLog.value.computeIfAbsent(
-                        neu.manager.getCurrentProfile(), k -> new ArrayList<>());
-                if(!log.contains(internalname)) {
-                    newItem.add(internalname);
-                    if(newItemAddMap.containsKey(internalname)) {
-                        if(System.currentTimeMillis() - newItemAddMap.get(internalname) > 1000) {
-                            log.add(internalname);
-                            try { neu.manager.saveConfig(); } catch(IOException ignored) {}
-                        }
-                    } else {
-                        newItemAddMap.put(internalname, System.currentTimeMillis());
-                    }
-                }
-            }
-        }
-    }*/
-
-	@SubscribeEvent(priority = EventPriority.HIGHEST)
-	public void onRenderEntitySpecials(RenderLivingEvent.Specials.Pre<EntityPlayer> event) {
-		if (Minecraft.getMinecraft().currentScreen instanceof GuiProfileViewer) {
-			if (((GuiProfileViewer) Minecraft.getMinecraft().currentScreen).getEntityPlayer() == event.entity) {
-				event.setCanceled(true);
-			}
-		}
-	}
-
-	@SubscribeEvent
-	public void onRenderGameOverlayPre(RenderGameOverlayEvent.Pre event) {
-		if (event.type != null && event.type.equals(RenderGameOverlayEvent.ElementType.BOSSHEALTH) &&
-			Minecraft.getMinecraft().currentScreen instanceof GuiContainer && neu.overlay.isUsingMobsFilter()) {
-			event.setCanceled(true);
-		}
-		if (event.type != null && event.type.equals(RenderGameOverlayEvent.ElementType.PLAYER_LIST)) {