v1.8.6future

3 files changed, 30 insertions, 48 deletions

diff --git a/chat/apiNew.js b/chat/apiNew.js
index eaab375..36025e3 100644
--- a/chat/apiNew.js
+++ b/chat/apiNew.js
@@ -7,18 +7,16 @@ register("chat", (key) => {
     axios.get(`https://api.hypixel.net/key?key=${key}`)
     .then(res => {
         if(res.data.success == true)
-        {
-            constants.data.api_key = key
-            constants.data.save()
             ChatLib.chat(`${PREFIX}&aSuccsessfully set api key!`)
-        }
         else
-            ChatLib.chat(`${PREFIX}&eKey is not valid!`)
+            ChatLib.chat(`${PREFIX}&eKey might not be valid!`)
+        constants.data.api_key = key
+        constants.data.save()
     })
     .catch(err => {
-        ChatLib.chat(`${PREFIX}&eKey is not valid!`)
+        ChatLib.chat(`${PREFIX}&eKey is not valid! if this is a mistake report: ${err}`)
     })
-    ChatLib.chat(ChatLib.getCenteredText(`${PREFIX}&aApi Key Successfully Set!`))
+    ChatLib.chat(`${PREFIX}&aApi Key Successfully Set!`)
 }).setCriteria(/Your new API key is (.+)/)
 
 export default ""
\ No newline at end of file
diff --git a/chat/grieferTrack.js b/chat/grieferTrack.js
index 2b745c3..157696b 100644
--- a/chat/grieferTrack.js
+++ b/chat/grieferTrack.js
@@ -1,6 +1,7 @@
 import axios from "../../axios"
 import settings from "../settings"
 import constants from "../util/constants"
+import { checkInDwarven, checkInHollows } from "../util/helperFunctions"
 const PREFIX = constants.PREFIX
 let checkedPlayers = [],
  griefers = []
@@ -25,7 +26,7 @@ register("worldLoad", () => {
 
 function checkMMiners()
 {
-    if (!settings.trackGriefers) return
+    if (!settings.trackGriefers || (!settings.grieferEverywhere && !(checkInDwarven() || checkInHollows()))) return
     try
     {
         const NetHandlerPlayClient = Client.getConnection(),
@@ -36,9 +37,13 @@ function checkMMiners()
             
             if(!checkedPlayers.includes(player))
             {
-                if(griefers.includes(player))
-                    ChatLib.chat(`${PREFIX}&e'${player}' is a griefer!`)
-                checkedPlayers.push(player)
+                let griefer = findGriefer(player)
+
+                if(griefer.found)
+                {
+                    ChatLib.chat(`${PREFIX}&e'${player}' has griefed &e&l${griefer.offences} &etime(s). Their last grief was on ${griefer.dateObj.toString().slice(4, 15)}.`)
+                    checkedPlayers.push(player)
+                }
             }
         })
     } catch(err) { if(settings.debug) console.log("grieferTrack trycatch: " + err) }
@@ -59,4 +64,20 @@ register("gameLoad", () => {
 })
 
 
+export function findGriefer(player)
+{
+    let grieferReturnObj = {}
+    grieferReturnObj.found = false
+    griefers.forEach(griefer => {
+        griefer.dateObj = new Date(0)
+        griefer.dateObj.setUTCMilliseconds(griefer.timestamp)
+
+        if(griefer.name.toLowerCase() == player.toLowerCase())
+        {
+            grieferReturnObj = griefer
+            grieferReturnObj.found = true
+        }
+    })
+    return grieferReturnObj
+}
 export default ""
\ No newline at end of file
diff --git a/chat/message.js b/chat/message.js
index 27cf78f..f55ecba 100644
--- a/chat/message.js
+++ b/chat/message.js
@@ -50,43 +50,6 @@ register("gameLoad", () => {
     })
 })
 
-
-register("messageSent", (origMessage, event) => { // emotes! this was fun to make :)
-    let commandState = 0,
-     command = "",
-     colonIndex1 = -1,
-     message = ""
-    
-    for(let charIndex = 0; charIndex < origMessage.length; charIndex++)
-    {
-        if(origMessage[charIndex] == ":" && commandState == 0)
-        {
-            colonIndex1 = charIndex
-            commandState = 1
-        }
-        else if (origMessage[charIndex] == ":" && commandState == 1)
-        {
-            commandState = 2
-            command = origMessage.slice(colonIndex1 + 1, charIndex).toLowerCase()
-        }
-    }
-    if(command == "shrug")
-    {
-        cancel(event)
-        emote = "¯\\_(ツ)_/¯"
-    }
-    else if (command == "lenny")
-    {
-        cancel(event)
-        emote = "( ͡° ͜ʖ ͡°)"
-    }
-    else
-        return
-    message = origMessage.slice(0, colonIndex1) + emote + origMessage.slice(colonIndex1 + 2 + command.length, origMessage.length)
-    ChatLib.say(`${message}`)
-})
-
-
 // first time check
 register("step", () => {
     if (constants.data.first_time)