diff options
| -rw-r--r-- | features/changeLogGUI/index.js | 3 | ||||
| -rw-r--r-- | features/hud/index.js | 2 | ||||
| -rw-r--r-- | features/nether/index.js | 37 |
3 files changed, 36 insertions, 6 deletions
diff --git a/features/changeLogGUI/index.js b/features/changeLogGUI/index.js index 11f0df7..44fc3bf 100644 --- a/features/changeLogGUI/index.js +++ b/features/changeLogGUI/index.js @@ -11,6 +11,7 @@ import SoopyMouseClickEvent from "../../../guimanager/EventListener/SoopyMouseCl import ProgressBar from "../../../guimanager/GuiElement/ProgressBar" import SoopyRenderEvent from "../../../guimanager/EventListener/SoopyRenderEvent" import { fetch } from "../../utils/networkUtils"; +import { numberWithCommas } from "../../utils/numberUtils"; const File = Java.type("java.io.File") const URL = Java.type("java.net.URL"); const PrintStream = Java.type("java.io.PrintStream"); @@ -232,7 +233,7 @@ class ChangelogPage extends GuiPage { this.changelogArea.addChild(changes) - changes.setText("# __" + data.version + "__" + (data.versionId === this.currVersionId ? " §7Current" : "") + "\n" + data.description) + changes.setText("# __" + data.version + "__" + (data.versionId === this.currVersionId ? " §7Current (" : " §7(") + numberWithCommas(data.users || 0) + " using)" + "\n" + data.description) height += changes.getHeight() diff --git a/features/hud/index.js b/features/hud/index.js index 9657f06..c6254d4 100644 --- a/features/hud/index.js +++ b/features/hud/index.js @@ -558,7 +558,7 @@ class Hud extends Feature { this.lastStatData._soulflow += parseInt(ChatLib.removeFormatting(line.split(` `)[0]).replace(/[^0-9]/g, "")) isSoulflowCounting = !line.endsWith(`Soulflow"`) } - if (line.startsWith(`display:{Lore:[0:"§7Internalized:`)) { + if (line.startsWith(`display:{Lore:[0:"§7Internalized:`) || line.startsWith(`4:"§7Internalized:`)) { isSoulflowCounting = !line.endsWith(`Soulflow"`) this.lastStatData._soulflow = parseInt(ChatLib.removeFormatting(line.split(`"§7Internalized: `)[1])) diff --git a/features/nether/index.js b/features/nether/index.js index c479e86..67accbc 100644 --- a/features/nether/index.js +++ b/features/nether/index.js @@ -45,10 +45,9 @@ class Nether extends Feature { this.masteryTimer = new ToggleSetting("Mastery Timer", "Countdown untill a block will turn red", true, "nether_mastery_timer", this) this.speedNextBlock = new ToggleSetting("Show next block to stand on for dojo swiftness", "", true, "dojo_swiftness", this) this.tenacityLine = new ToggleSetting("Show line for fireball in dojo tenacity", "This may help you to dodge the fireballs", false, "dojo_tanacity", this) - //TODO: Vanquisher waypoints (&r&aA &r&cVanquisher &r&ais spawning nearby!&r) - //TODO: add toggle setting for hostage waypoint this.hostageWaypoints = new ToggleSetting("Show hostage waypoints", "Waypoint for location of hostage in rescue missions", true, "hostage_waypoint", this) this.vaniquisherWaypoints = new ToggleSetting("Show vaniqusher waypoints", "Shows the locations of other player's vanquishers", true, "vanquisher_waypoint", this) + this.slugfishTimer = new ToggleSetting("Show timer over rod", "This may help with fishing slugfish", false, "slugfish_timer", this) this.registerCustom("packetReceived", this.packetReceived).registeredWhen(() => this.isInDojo()) this.registerStep(true, 1, this.step1S).registeredWhen(() => this.isInNether()) this.registerEvent("renderWorld", this.renderWorld).registeredWhen(() => this.isInNether()) @@ -64,6 +63,9 @@ class Nether extends Feature { this.rescueMissionDifficulty = undefined this.rescueMissionType = undefined this.lastBlock = undefined + this.hookThrown = 0 + + this.spawnedVanqs = [] this.registerChat("&r&r&r &r&aTest of Swiftness &r&e&lOBJECTIVES&r", () => { if (this.speedNextBlock.getValue()) { this.inSwiftness = true @@ -85,8 +87,6 @@ class Nether extends Feature { this.registerChat("&r&aA ${*}Vanquisher &r&ais spawning nearby!&r", () => { socketConnection.sendVancData({ loc: [Math.round(Player.getX()), Math.round(Player.getY()), Math.round(Player.getZ())] }); }) - - this.spawnedVanqs = [] } vanqData(loc) { @@ -94,6 +94,15 @@ class Nether extends Feature { } tick() { + + let fishHook = Player.getPlayer()[f.fishEntity] + + if (fishHook) { + if (!this.hookThrown) this.hookThrown = Date.now() + } else { + this.hookThrown = 0 + } + if (Player.getContainer().getName() === "Rescue" && Player.getContainer().getStackInSlot(22)) { let difficulty = ChatLib.removeFormatting(Player.getContainer().getStackInSlot(22).getName()).trim()[0] @@ -207,6 +216,17 @@ class Nether extends Feature { drawCoolWaypoint(this.spawnedVanqs[key][0], this.spawnedVanqs[key][1], this.spawnedVanqs[key][2], 255, 0, 0, { name: key + "'s vanquisher (" + Math.floor((Date.now() - this.spawnedVanqs[key][2]) / 1000) + "s)" }) }) } + + if (this.slugfishTimer.getValue()) { + let hook = Player.getPlayer()[f.fishEntity] + if (hook && this.hookThrown) { + let x = hook[f.posX.Entity] + let y = hook[f.posY.Entity] + let z = hook[f.posZ.Entity] + + Tessellator.drawString(((Date.now() - this.hookThrown) / 1000).toFixed(1) + "s", x, y + 0.5, z, Renderer.color(0, 255, 50), false, 0.025, false) + } + } } step1S() { @@ -231,3 +251,12 @@ let nether = new Nether() module.exports = { class: nether, }; + +function getField(e, field) { + + let field2 = e.class.getDeclaredField(field); + + field2.setAccessible(true) + + return field2.get(e) +}
\ No newline at end of file |