1.6.1 Fixed fps bugv1.6.2

2 files changed, 32 insertions, 26 deletions

diff --git a/chat/message.js b/chat/message.js
index 7a221c7..6e3796f 100644
--- a/chat/message.js
+++ b/chat/message.js
@@ -1,51 +1,57 @@
 /*
 Created 11/11/2022 by Ninjune.
 */
-
 import axios from "../../axios"
 import settings from "../settings"
 import constants from "../util/constants"
 import { addCommas } from "../util/helperFunctions"
 const PREFIX = constants.PREFIX
+let cwlbData = {},
+ newMessage, message, messagePrefix, cwlbPlayerData, onward
 
 register("chat", (level, typeOfChat, hypixelRank, username, playerMessage, event) => { // CW Rank
     if(!settings.rankChat) return
     if(!settings.rankEverywhere && !(constants.serverData.map == "Crystal Hollows" || constants.serverData.map == "Dwarven Mines")) return
     if(!settings.rankEverywhere && typeOfChat != "") return
-    let onward = true
+    onward = true
 
     playerMessage.split(" ").forEach((chunk) => {
         if (chunk.startsWith("https"))
             onward = false
     })
-    if(!onward) return
-
-    let message = ChatLib.getChatMessage(event, true),
-     messagePrefix = message,
-     newMessage = new Message()
+    if(!onward || cwlbData == undefined) return
     cancel(event)
-    axios.get(`https://ninjune.dev/api/lbpos?username=${username}`)
-    .then(res => {
-        if(res.data.rank > 0 && res.data.rank < 501)
-            messagePrefix = message.slice(0, message.indexOf(':')) + ` &8[&6#${addCommas(res.data.rank)}&8]&f: `
-        else if(hypixelRank == "" && typeOfChat == "")
-            messagePrefix = message.slice(0, message.indexOf(':')) + `&7: `
-        else
-            messagePrefix = message.slice(0, message.indexOf(':')) + `&f: `
-        
-        newMessage.addTextComponent(messagePrefix)
+    newMessage = new Message()
+    message = ChatLib.getChatMessage(event, true),
+    messagePrefix = message
+
+    cwlbPlayerData = cwlbData.filter(player => player.name == username)[0]
+    if(cwlbPlayerData.rank > 0 && cwlbPlayerData.rank < 501)
+        messagePrefix = message.slice(0, message.indexOf(':')) + ` &8[&6#${addCommas(cwlbPlayerData.rank)}&8]&f: `
+    else if(hypixelRank == "" && typeOfChat == "")
+        messagePrefix = message.slice(0, message.indexOf(':')) + `&7: `
+    else
+        messagePrefix = message.slice(0, message.indexOf(':')) + `&f: `
+    
+    newMessage.addTextComponent(messagePrefix)
 
-        if (hypixelRank == "" && typeOfChat == "")
-            playerMessage = "&7" + playerMessage.slice(0)
-        else
-            playerMessage = "&f" + playerMessage.slice(0)
-        
-        newMessage.addTextComponent(playerMessage)
-        ChatLib.chat(newMessage)
+    if (hypixelRank == "" && typeOfChat == "")
+        playerMessage = "&7" + playerMessage.slice(0)
+    else
+        playerMessage = "&f" + playerMessage.slice(0)
+    
+    newMessage.addTextComponent(playerMessage)
+    ChatLib.chat(newMessage)
+}).setCriteria(/^(\[\d+\] )?((?:(?:Guild|Party|Co-op) > )|(?:\[:v:\] ))?(\[\w+\+{0,2}\] )?(\w{1,16})(?: \[\w{1,6}\])?: (.*)$/g)
+
+register("worldLoad", () => {
+    axios.get(`https://ninjune.dev/api/coleweight-leaderboard`)
+    .then(res => {
+        cwlbData = res.data
     })
     .catch(err => {
         ChatLib.chat(err)
     })
-}).setCriteria(/^(\[\d+\] )?((?:(?:Guild|Party|Co-op) > )|(?:\[:v:\] ))?(\[\w+\+{0,2}\] )?(\w{1,16})(?: \[\w{1,6}\])?: (.*)$/g)
+})
 
 export default ""
\ No newline at end of file
diff --git a/metadata.json b/metadata.json
index 67d1e43..8376c03 100644
--- a/metadata.json
+++ b/metadata.json
@@ -3,6 +3,6 @@
   "creator": "Ninjune",
   "entry": "index.js",
   "description": "Simple Coleweight module to measure mining progression.",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "requires": ["axios", "PogData", "Vigilance"]
 }
\ No newline at end of file