v1.6.11

3 files changed, 61 insertions, 57 deletions

diff --git a/commands/claim.js b/commands/claim.js
index 52cb5f8..e3f9a0d 100644
--- a/commands/claim.js
+++ b/commands/claim.js
@@ -2,7 +2,10 @@ import axios from "../../axios"
 import settings from "../settings"
 import constants from "../util/constants"
 const PREFIX = constants.PREFIX
+const path = `https://ninjune.dev`
 const serverId = java.util.UUID.randomUUID().toString().replace("-", "")
+let claimedServers = []
+
 
 export function claim(structure)
 {
@@ -24,11 +27,12 @@ export function claim(structure)
         return
     }
     
-    axios.get(`https://ninjune.dev/api/claim?type=${structure}&lobby=${constants.serverData.server}&username=${Player.getName()}&serverID=${serverId}`)
+    axios.get(`${path}/api/claim?type=${structure}&lobby=${constants.serverData.server}&username=${Player.getName()}&serverID=${serverId}`)
     .then(res => {
         if(res.data.success)
         {
             ChatLib.chat(`${PREFIX}&aSuccessfully claimed ${constants.serverData.server} as your server!`)
+            claimedServers.push({player: Player.getName(), server: constants.serverData.server, structure: structure})
             return
         }
         else
@@ -37,68 +41,79 @@ export function claim(structure)
             if(res.data.code == 501)
             {
                 ChatLib.chat(`${PREFIX}&cError: Not logged into the auth server. Try running the command again.`)
-                Client.getMinecraft().func_152347_ac().joinServer(Client.getMinecraft().func_110432_I().func_148256_e(), Client.getMinecraft().func_110432_I().func_148254_d(), serverId)
-                return
+                return Client.getMinecraft().func_152347_ac().joinServer(Client.getMinecraft().func_110432_I().func_148256_e(), Client.getMinecraft().func_110432_I().func_148254_d(), serverId)
             }
             else
-                ChatLib.chat(`${PREFIX}&cError: ${res.data.reason}.`)
+                return ChatLib.chat(`${PREFIX}&cError: ${res.data.reason}.`)
         }
     })
     .catch(err => {
-        ChatLib.chat(`${PREFIX}&cError: ${err}`)
+        return ChatLib.chat(`${PREFIX}&cError: ${err}`)
     })
-    
 }
 
+
 register('gameLoad', (event) => {
     try
     {
         Client.getMinecraft().func_152347_ac().joinServer(Client.getMinecraft().func_110432_I().func_148256_e(), Client.getMinecraft().func_110432_I().func_148254_d(), serverId)
     }
     catch(e) {}
+    // what if a player claims after gameload? idk man, making requests every worldload is hurting my server. 
+    // this feature is barely used anyway.
+    getClaimed()
 })
 
+
 register('worldLoad', () => {
     if(!settings.claiming) return
-    axios.get(`https://ninjune.dev/api/unclaim?username=${Player.getName()}&serverID=${serverId}`)
-    .then(res => {
-        if(settings.debug && !res.data.success)
-            ChatLib.chat("Unclaim: " + res.data.reason)
-            if(res.data.code == 501)
-                Client.getMinecraft().func_152347_ac().joinServer(Client.getMinecraft().func_110432_I().func_148256_e(), Client.getMinecraft().func_110432_I().func_148254_d(), serverId)
-    })
-    .catch(err => {
-        if(settings.debug)
-            ChatLib.chat(`${PREFIX}&cError: ${err}`)
-    })
-    // unclaims the lobby, isn't needed but will allow another player to claim lobby after claimer leaves.
+    if(claimedServers == undefined)
+        getClaimed()
     setTimeout(() => {
         const NetHandlerPlayClient = Client.getConnection(),
          PlayerMap = NetHandlerPlayClient.func_175106_d()  // getPlayerInfoMap
-        
+        let player
+
         if(settings.debug) console.log(constants.serverData.server)
-        axios.get(`https://ninjune.dev/api/claimed?serverID=${constants.serverData.server}&authServer=${serverId}&passedName=${Player.getName()}`)
-        .then(res => {
-            if(res.data.claimed)
-            {
-                PlayerMap.filter(player => player.func_178853_c() /* getResponseTime */ > 0 && !player.func_178845_a()/* getGameProfile */.name.startsWith("!")).forEach((PlayerMP) => {
-                    let player = PlayerMP.func_178845_a()/* getGameProfile */.name
+        
+        claimedServers.forEach((claimedServer) => {
+            PlayerMap.filter(player => player.func_178853_c() > 0 && !player.func_178845_a().name.startsWith("!")).forEach((PlayerMP) => {
+                player = PlayerMP.func_178845_a().name
+
+                if (player == claimedServer.player && claimedServer.server == constants.serverData.server)
+                    ChatLib.chat(`${PREFIX}&cThe ${claimedServer.structure} in ${claimedServer.server} is claimed by ${claimedServer.player}.`)
+            })
 
-                    res.data.structures.forEach((structure) => {
-                        if (player == structure.player)
-                            ChatLib.chat(`${PREFIX}&cThe ${structure.structure} in ${structure.server} is claimed by ${structure.player}.`) 
-                            //holy im so good at naming things, structure.structure I must be a genius.
+            if (Player.getName() == claimedServer.player)
+                {
+                    axios.get(`${path}/api/unclaim?username=${Player.getName()}&serverID=${serverId}`)
+                    .then(res => {
+                        if(settings.debug && !res.data.success)
+                            ChatLib.chat("Unclaim: " + res.data.reason)
+                            if(res.data.code == 501)
+                                Client.getMinecraft().func_152347_ac().joinServer(Client.getMinecraft().func_110432_I().func_148256_e(), Client.getMinecraft().func_110432_I().func_148254_d(), serverId)
                     })
-                })
-            }
-            else if (res.data.err && settings.debug)
-            {
-                ChatLib.chat("Check claim: " + res.data.reason)
-            }
-        })
-        .catch(err => {
-            if(!settings.debug) return
-            ChatLib.chat(`${PREFIX}&cError: ${err}`)
+                    .catch(err => {
+                        if(settings.debug)
+                            ChatLib.chat(`${PREFIX}&cError: ${err}`)
+                    })
+                }
         })
     }, 2000)
-})
\ No newline at end of file
+})
+
+
+function getClaimed()
+{
+    axios.get(`${path}/api/claimed?authServer=${serverId}&passedName=${Player.getName()}`)
+    .then(res => {
+        if(res.data.code == 501)
+        {
+            Client.getMinecraft().func_152347_ac().joinServer(Client.getMinecraft().func_110432_I().func_148256_e(), Client.getMinecraft().func_110432_I().func_148254_d(), serverId)
+            return
+        }
+        res.data.forEach(server => {
+            claimedServers.push(server)
+        })
+    })
+}
diff --git a/commands/fetchDiscord.js b/commands/fetchDiscord.js
index f44c385..f254edb 100644
--- a/commands/fetchDiscord.js
+++ b/commands/fetchDiscord.js
@@ -6,14 +6,14 @@ export function fetchDiscord(arg)
 {
     if(arg == undefined) { ChatLib.chat(`${PREFIX}&eRequires a username!`); return }
 
-    axios.get(`https://api.ashcon.app/mojang/v2/user/${arg}`)
-        .then(res => {
-            let uuid = res.data.uuid
+    axios.get(`https://api.mojang.com/users/profiles/minecraft/${arg}`)
+        .then(mojangRes => {
+            let uuid = mojangRes.data.id
             axios.get(`https://api.hypixel.net/player?key=${constants.data.api_key}&uuid=${uuid}`)
-            .then(res2 => {
-                let discordMessage = new TextComponent(`${PREFIX}&a${res.data.username}'s Discord: `)
+            .then(hypixelRes => {
+                let discordMessage = new TextComponent(`${PREFIX}&a${mojangRes.data.name}'s Discord: `)
                 ChatLib.chat(discordMessage);
-                ChatLib.chat(`&b${res2.data.player.socialMedia.links.DISCORD}`)
+                ChatLib.chat(`&b${hypixelRes.data.player.socialMedia.links.DISCORD}`)
             })
             .catch(err => {
                 ChatLib.chat(`${PREFIX}&eNo discord linked :( (or no key linked)`)
diff --git a/commands/reload.js b/commands/reload.js
deleted file mode 100644
index 1c5fcc0..0000000
--- a/commands/reload.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import constants from "../util/constants"
-const PREFIX = constants.PREFIX
-
-export function reload() 
-{
-    constants.upTimeTrack = false
-    constants.stepsSinceLast = 0
-    constants.cwValues = []
-    constants.uptime = 0
-    ChatLib.chat(`${PREFIX}Reloaded!`)
-}
\ No newline at end of file