diff options
| -rw-r--r-- | chat/message.js | 44 | ||||
| -rw-r--r-- | commands/claim.js | 10 | ||||
| -rw-r--r-- | metadata.json | 2 | ||||
| -rw-r--r-- | render/naturals.js | 4 |
4 files changed, 47 insertions, 13 deletions
diff --git a/chat/message.js b/chat/message.js index c7cfe9f..79b6be1 100644 --- a/chat/message.js +++ b/chat/message.js @@ -27,12 +27,7 @@ register("chat", (level, typeOfChat, hypixelRank, username, playerMessage, event messagePrefix = message cancel(event) - 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: ` + messagePrefix = message.slice(0, message.indexOf(':')) + ` &8[&6#${addCommas(cwlbPlayerData.rank)}&8]&f: ` newMessage.addTextComponent(messagePrefix) @@ -45,8 +40,43 @@ register("chat", (level, typeOfChat, hypixelRank, username, playerMessage, event ChatLib.chat(newMessage) }).setCriteria(/^(\[\d+\] )?((?:(?:Guild|Party|Co-op) > )|(?:\[:v:\] ))?(\[\w+\+{0,2}\] )?(\w{1,16})(?: \[\w{1,6}\])?: (.*)$/g) +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}`) +}) + register("worldLoad", () => { - axios.get(`https://ninjune.dev/api/coleweight-leaderboard`) + axios.get(`https://ninjune.dev/api/coleweight-leaderboard?length=500`) .then(res => { cwlbData = res.data }) diff --git a/commands/claim.js b/commands/claim.js index 5abeda8..ae20924 100644 --- a/commands/claim.js +++ b/commands/claim.js @@ -24,7 +24,7 @@ export function claim(structure) return } - axios.get(`https://ninjune.dev/api/claim?type=${structure}&lobby=${constants.serverData.server}&method=auth&username=${Player.getName()}&serverID=${serverId}`) + axios.get(`https://ninjune.dev/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!`) @@ -50,7 +50,7 @@ register('gameLoad', (event) => { register('worldLoad', () => { if(!settings.claiming) return - axios.get(`https://ninjune.dev/api/unclaim?method=auth&username=${Player.getName()}&serverID=${serverId}`) + 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) @@ -67,7 +67,7 @@ register('worldLoad', () => { PlayerMap = NetHandlerPlayClient.func_175106_d() // getPlayerInfoMap if(settings.debug) console.log(constants.serverData.server) - axios.get(`https://ninjune.dev/api/claim?claimedlobby=${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) { @@ -81,6 +81,10 @@ register('worldLoad', () => { }) }) } + else if (res.data.err && settings.debug) + { + ChatLib.chat("Check claim: " + res.data.reason) + } }) .catch(err => { if(!settings.debug) return diff --git a/metadata.json b/metadata.json index 1031128..bcc3bd6 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.4", + "version": "1.6.5", "requires": ["axios", "PogData", "Vigilance"] }
\ No newline at end of file diff --git a/render/naturals.js b/render/naturals.js index 77a667d..d0443a3 100644 --- a/render/naturals.js +++ b/render/naturals.js @@ -1,11 +1,11 @@ -import axios from "../../axios" // USE AT YOUR OWN RISK disabled by default in this version because dragoonmaster4 wants me to confirm that this isn't bannable with admins before adding. +import axios from "../../axios" import settings from "../settings" import constants from "../util/constants" const PREFIX = constants.PREFIX let coords = [] register("step", () => { - if(constants.serverData.map != "Crystal Hollows" || !settings.showNaturals) return + if(constants.serverData.map != "Crystal Hollows") return axios.get(`https://ninjune.dev/api/coords`) .then((res) => { coords = [] |