Merge pull request #231 from DoKM/master

DoKM Fork Merge

1 files changed, 65 insertions, 5 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
index d84038fa..bf305b51 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
@@ -279,6 +279,65 @@ public class GuiProfileViewer extends GuiScreen {
 
                 Utils.drawStringCentered(str, Minecraft.getMinecraft().fontRendererObj,
                         guiLeft+sizeX/2f, guiTop+101, true, 0);
+
+                //This is just here to inform the player what to do
+                //like typing /api new or telling them to go find a psychotherapist
+                long timeDiff = System.currentTimeMillis() - startTime;
+
+                if(timeDiff > 20000){
+                    Utils.drawStringCentered(EnumChatFormatting.YELLOW+"Its taking a while...", Minecraft.getMinecraft().fontRendererObj,
+                            guiLeft+sizeX/2f, guiTop+111, true, 0);
+                    Utils.drawStringCentered(EnumChatFormatting.YELLOW+"Try \"/api new\".", Minecraft.getMinecraft().fontRendererObj,
+                            guiLeft+sizeX/2f, guiTop+121, true, 0);
+                    if(timeDiff > 60000){
+                        Utils.drawStringCentered(EnumChatFormatting.YELLOW+"Might be hypixel's fault.", Minecraft.getMinecraft().fontRendererObj,
+                                guiLeft+sizeX/2f, guiTop+131, true, 0);
+                        if(timeDiff > 180000){
+                            Utils.drawStringCentered(EnumChatFormatting.YELLOW+"Wow you're still here?", Minecraft.getMinecraft().fontRendererObj,
+                                    guiLeft+sizeX/2f, guiTop+141, true, 0);
+                            if(timeDiff > 360000){
+                                long second = (timeDiff / 1000) % 60;
+                                long minute = (timeDiff / (1000 * 60)) % 60;
+                                long hour = (timeDiff / (1000 * 60 * 60)) % 24;
+
+                                String time = String.format("%02d:%02d:%02d", hour, minute, second);
+                                Utils.drawStringCentered(EnumChatFormatting.YELLOW+"You've wasted your time here for: "+time, Minecraft.getMinecraft().fontRendererObj,
+                                        guiLeft+sizeX/2f, guiTop+151, true, 0);
+                                Utils.drawStringCentered(EnumChatFormatting.YELLOW+""+EnumChatFormatting.BOLD+"What are you doing with your life?", Minecraft.getMinecraft().fontRendererObj,
+                                        guiLeft+sizeX/2f, guiTop+161, true, 0);
+                                if(timeDiff > 600000){
+                                    Utils.drawStringCentered(EnumChatFormatting.RED+""+EnumChatFormatting.BOLD+"Maniac", Minecraft.getMinecraft().fontRendererObj,
+                                            guiLeft+sizeX/2f, guiTop+171, true, 0);
+                                    if(timeDiff > 1200000){
+                                        Utils.drawStringCentered(EnumChatFormatting.RED+""+EnumChatFormatting.BOLD+"You're a menace to society", Minecraft.getMinecraft().fontRendererObj,
+                                                guiLeft+sizeX/2f, guiTop+181, true, 0);
+                                        if(timeDiff > 1800000){
+                                            Utils.drawStringCentered(EnumChatFormatting.RED+""+EnumChatFormatting.BOLD+"You dont know whats gonna happen to you", Minecraft.getMinecraft().fontRendererObj,
+                                                    guiLeft+sizeX/2f, guiTop+191, true, 0);
+                                            if(timeDiff > 3000000){
+                                                Utils.drawStringCentered(EnumChatFormatting.RED+""+EnumChatFormatting.BOLD+"You really want this?", Minecraft.getMinecraft().fontRendererObj,
+                                                        guiLeft+sizeX/2f, guiTop+91, true, 0);
+                                                if(timeDiff > 3300000){
+                                                    Utils.drawStringCentered(EnumChatFormatting.DARK_RED+""+EnumChatFormatting.BOLD+"OW LORD FORGIVE ME FOR THIS", Minecraft.getMinecraft().fontRendererObj,
+                                                            guiLeft+sizeX/2f, guiTop+71, true, 0);
+                                                    if(timeDiff > 3600000){
+                                                        throw new Error("Go do something productive") {
+                                                            @Override
+                                                            public void printStackTrace() {
+                                                                throw new Error("Go do something productive");
+                                                            }
+                                                        };
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                
                 break;
             case INVALID_NAME:
                 Utils.drawStringCentered(EnumChatFormatting.RED+"Invalid name or API is down!", Minecraft.getMinecraft().fontRendererObj,
@@ -1876,14 +1935,15 @@ public class GuiProfileViewer extends GuiScreen {
     }
 
 
-    public int countItemsInInventory(String internalname, JsonObject inventoryInfo, String... invsToSearch) {
+    public int countItemsInInventory(String internalname, JsonObject inventoryInfo, boolean specific, String... invsToSearch) {
         int count = 0;
         for(String inv : invsToSearch) {
             JsonArray invItems = inventoryInfo.get(inv).getAsJsonArray();
             for(int i=0; i<invItems.size(); i++) {
                 if(invItems.get(i) == null || !invItems.get(i).isJsonObject()) continue;
                 JsonObject item = invItems.get(i).getAsJsonObject();
-                if(item.get("internalname").getAsString().equals(internalname)) {
+                if((specific && item.get("internalname").getAsString().equals(internalname)) ||
+                        (!specific && item.get("internalname").getAsString().contains(internalname))) {
                     if(item.has("count")) {
                         count += item.get("count").getAsInt();
                     } else {
@@ -2242,13 +2302,13 @@ public class GuiProfileViewer extends GuiScreen {
         }
 
         if(arrowCount == -1) {
-            arrowCount = countItemsInInventory("ARROW", inventoryInfo, "quiver");
+            arrowCount = countItemsInInventory("ARROW", inventoryInfo, false,"quiver");
         }
         if(greenCandyCount == -1) {
-            greenCandyCount = countItemsInInventory("GREEN_CANDY", inventoryInfo, "candy_inventory_contents");
+            greenCandyCount = countItemsInInventory("GREEN_CANDY", inventoryInfo, true,"candy_inventory_contents");
         }
         if(purpleCandyCount == -1) {
-            purpleCandyCount = countItemsInInventory("PURPLE_CANDY", inventoryInfo, "candy_inventory_contents");
+            purpleCandyCount = countItemsInInventory("PURPLE_CANDY", inventoryInfo, true, "candy_inventory_contents");
         }
 
         Utils.drawItemStackWithText(NotEnoughUpdates.INSTANCE.manager.jsonToStack(