v1.6.11

2 files changed, 40 insertions, 23 deletions

diff --git a/render/cwGui.js b/render/cwGui.js
index 4e0f660..5af6773 100644
--- a/render/cwGui.js
+++ b/render/cwGui.js
@@ -11,7 +11,8 @@ let cwValues = [],
  baseColeweight = 0,
  stepsSinceLast = 0,
  coleweightHr = 0,
- cwValuesSum = 0
+ cwValuesSum = 0,
+ cwInfo
 
 
 export function openCwGui()
@@ -20,6 +21,16 @@ export function openCwGui()
 }
 
 
+export function reload() 
+{
+    upTimeTrack = false
+    stepsSinceLast = 0
+    cwValues = []
+    uptime = 0
+    ChatLib.chat(`${PREFIX}Reloaded!`)
+}
+
+
 register("dragged", (dx, dy, x, y) => {
     if (!cwGui.isOpen()) return
     constants.data.x = x
@@ -63,6 +74,12 @@ register("renderOverlay", () => {
         Renderer.drawStringWithShadow(`&aCW: &b${coleweightMessage}\n&aCW/hr: &b${coleweightHr}\n&aUptime: &b${Math.floor(uptime/60)}m ${Math.floor(uptime%60)}s\n&aColeweight Gained: &b${Math.ceil(cwValuesSum*100) / 100}`, data.x, data.y)
 })
 
+register("gameLoad", () => {
+    axios.get(`https://ninjune.dev/api/cwinfo`)
+    .then(cwInfoRes => {
+        cwInfo = cwInfoRes.data
+    })
+})
 
 
 register("step", () => {
@@ -88,12 +105,9 @@ register("step", () => {
                     uuid = uuid + tempUuid[i]
                 }
             }
-            axios.get(`https://ninjune.dev/api/cwinfo`)
-            .then(cwInfoRes => {
                 axios.get(`https://api.hypixel.net/skyblock/profiles?key=${constants.data.api_key}&uuid=${uuid}`)
                 .then(res => {
-                    let eq = 0,
-                     cwInfo = cwInfoRes.data
+                    let eq = 0
 
                     for(let i=0; i < res.data.profiles.length; i+=1) 
                     {
@@ -168,6 +182,7 @@ register("step", () => {
                     }
                     else if(stepsSinceLast > 20)
                     {
+                        uptime = 0
                         upTimeTrack = false
                         stepsSinceLast = 0
                         cwValues = []
@@ -180,7 +195,6 @@ register("step", () => {
                     data.coleweight = Math.ceil(coleweight*100)/100
                     data.save()
                 })
-                })
         }
         catch(e) {}
     }
diff --git a/render/naturals.js b/render/naturals.js
index 595c32d..2f9adc9 100644
--- a/render/naturals.js
+++ b/render/naturals.js
@@ -2,37 +2,40 @@ import axios from "../../axios"
 import settings from "../settings"
 import constants from "../util/constants"
 import { waypointRender } from "../util/helperFunctions"
-const PREFIX = constants.PREFIX
-let coords = []
+let coords = [],
+ visibleCoords = []
 
-
-register("step", () => {
-    if(constants.serverData.map != "Crystal Hollows") return
+register("gameLoad", res => {
     axios.get(`https://ninjune.dev/api/coords`)
     .then((res) => {
-        coords = []
-        res.data.filter(coord => 
-            (((-1 * settings.naturalRange)/2 < (parseInt(Player.getX()) - coord.x)) && ((parseInt(Player.getX()) - coord.x) < settings.naturalRange/2)
-            && ((-1 * settings.naturalRange)/2 < (parseInt(Player.getY()) - coord.y)) && ((parseInt(Player.getY()) - coord.y) < settings.naturalRange/2)
-            && ((-1 * settings.naturalRange)/2 < (parseInt(Player.getZ()) - coord.z)) && ((parseInt(Player.getZ()) - coord.z) < settings.naturalRange/2))
-        ).forEach(coord => {
-            coords.push([coord.x, coord.y, coord.z])
-        })
+        coords = res.data
     })
     .catch((err) => {
-        console.log(err)
+        if(settings.debug) return console.log(err)
+    })
+})
+
+register("step", () => {
+    if(constants.serverData.map != "Crystal Hollows" || !settings.showNaturals) return
+    visibleCoords = []
+    coords.filter(coord => 
+        (((-1 * settings.naturalRange)/2 < (parseInt(Player.getX()) - coord.x)) && ((parseInt(Player.getX()) - coord.x) < settings.naturalRange/2)
+        && ((-1 * settings.naturalRange)/2 < (parseInt(Player.getY()) - coord.y)) && ((parseInt(Player.getY()) - coord.y) < settings.naturalRange/2)
+        && ((-1 * settings.naturalRange)/2 < (parseInt(Player.getZ()) - coord.z)) && ((parseInt(Player.getZ()) - coord.z) < settings.naturalRange/2))
+    ).forEach(coord => {
+        visibleCoords.push([coord.x, coord.y, coord.z])
     })
 }).setFps(1)
 
 
 register("renderWorld", () => {
     if(!settings.showNaturals) return
-    if(coords.length < 1) return
-    waypointRender(coords)
+    if(visibleCoords.length < 1) return
+    waypointRender(visibleCoords)
 })
 
 register("worldUnload", () => {
-    coords = []
+    visibleCoords = []
 })