diff options
author | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2022-08-03 19:03:59 +0800 |
---|---|---|
committer | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2022-08-03 19:03:59 +0800 |
commit | 3525dce1d84a53dae0414388ba886b66323e2afd (patch) | |
tree | 1c3a0a37bcd11fd30131b0c834864ce60bf04221 | |
parent | c7f0e8bcbb3cabda3a9bb11f1235763d59c07875 (diff) | |
download | SoopyV2-3525dce1d84a53dae0414388ba886b66323e2afd.tar.gz SoopyV2-3525dce1d84a53dae0414388ba886b66323e2afd.tar.bz2 SoopyV2-3525dce1d84a53dae0414388ba886b66323e2afd.zip |
small fixes
-rw-r--r-- | features/changeLogGUI/index.js | 2 | ||||
-rw-r--r-- | features/dungeonSolvers/index.js | 6 | ||||
-rw-r--r-- | features/globalSettings/firstLoadPages.js | 2 | ||||
-rw-r--r-- | features/hud/index.js | 2 | ||||
-rw-r--r-- | features/nether/index.js | 22 | ||||
-rw-r--r-- | logger.js | 2 | ||||
-rw-r--r-- | socketConnection.js | 7 |
7 files changed, 21 insertions, 22 deletions
diff --git a/features/changeLogGUI/index.js b/features/changeLogGUI/index.js index 55a9e83..f9bf97d 100644 --- a/features/changeLogGUI/index.js +++ b/features/changeLogGUI/index.js @@ -247,7 +247,7 @@ class ChangelogPage extends GuiPage { height += changes.getHeight() - height += 0.1 + height += 0.05 }) } } diff --git a/features/dungeonSolvers/index.js b/features/dungeonSolvers/index.js index 60d4b16..1643057 100644 --- a/features/dungeonSolvers/index.js +++ b/features/dungeonSolvers/index.js @@ -280,6 +280,12 @@ class DungeonSolvers extends Feature { this.area = -1 this.areaUpdated() }) + this.registerEvent("worldLoad", () => { + if (this.area !== -1) { + this.area = -1 + this.areaUpdated() + } + }) this.registerChat("[BOSS] Goldor: Who dares trespass into my domain?", () => { this.area = 0 this.areaUpdated() diff --git a/features/globalSettings/firstLoadPages.js b/features/globalSettings/firstLoadPages.js index 19562a0..6955a90 100644 --- a/features/globalSettings/firstLoadPages.js +++ b/features/globalSettings/firstLoadPages.js @@ -10,7 +10,7 @@ class WelcomePage extends FirstLoadPage { constructor() { super() - this.addChild(new SoopyTextElement().setText("§0Welcome to SoopyAddons V2!").setLocation(0.1, 0.05, 0.8, 0.1).setMaxTextScale(10)); + this.addChild(new SoopyTextElement().setText("§0Welcome to SoopyV2!").setLocation(0.1, 0.05, 0.8, 0.1).setMaxTextScale(10)); // this.addChild(new SoopyTextElement().setText("§7First lets get privacy settings out of the way.").setLocation(0.1, 0.15,0.8,0.075).setMaxTextScale(10)); diff --git a/features/hud/index.js b/features/hud/index.js index 3980dff..b01d156 100644 --- a/features/hud/index.js +++ b/features/hud/index.js @@ -284,7 +284,7 @@ class Hud extends Feature { this.lastSwappedPet = Date.now() }) this.registerChat("&r&aYour &r${pet} &r&alevelled up to level &r&9${level}&r&a!&r", (pet, level) => { - if (this.petText.split("] ")[1] === pet) { + if (ChatLib.removeFormatting(this.petText.split("] ")[1].trim()) === ChatLib.removeFormatting(pet.trim())) { this.petElement.setText("&6Pet&7> &7[Lvl " + (level || "??") + "] " + pet) this.petText = "&6Pet&7> &7[Lvl " + (level || "??") + "] " + pet this.lastSwappedPet = Date.now() diff --git a/features/nether/index.js b/features/nether/index.js index 26aea22..97f9678 100644 --- a/features/nether/index.js +++ b/features/nether/index.js @@ -55,17 +55,6 @@ class Nether extends Feature { this.disciplineOverlay = new ToggleSetting("Show overlay for zombies in dojo discipline", "", true, "dojo_discipline", this).contributor("Empa") this.hostageWaypoints = new ToggleSetting("Show hostage waypoints", "Waypoint for location of hostage in rescue missions", true, "hostage_waypoint", this) this.slugfishTimer = new ToggleSetting("Show timer over rod", "This may help with fishing slugfish", false, "slugfish_timer", this) - let packetRecieved = this.registerCustom("packetReceived", this.packetReceived).registeredWhen(() => this.isInDojo()) - - try { - packetRecieved.trigger.setPacketClasses([net.minecraft.network.play.server.S23PacketBlockChange, net.minecraft.network.play.server.S22PacketMultiBlockChange]) - } catch (e) { }//older ct version - - this.registerStep(true, 1, this.step1S).registeredWhen(() => this.isInNether()) - this.registerEvent("renderWorld", this.renderWorld).registeredWhen(() => this.isInNether()) - - this.registerForge(net.minecraftforge.event.entity.EntityJoinWorldEvent, this.entityJoinWorldEvent).registeredWhen(() => this.isInDojo()); - this.registerEvent("tick", this.tick).registeredWhen(() => this.isInNether()) this.todoE = [] this.todoE2 = [] @@ -88,6 +77,17 @@ class Nether extends Feature { this.lastBlock = undefined this.hookThrown = 0 + let packetRecieved = this.registerCustom("packetReceived", this.packetReceived).registeredWhen(() => this.isInDojo()) + + try { + packetRecieved.trigger.setPacketClasses([net.minecraft.network.play.server.S23PacketBlockChange, net.minecraft.network.play.server.S22PacketMultiBlockChange]) + } catch (e) { }//older ct version + + this.registerStep(true, 1, this.step1S).registeredWhen(() => this.isInNether()) + this.registerEvent("renderWorld", this.renderWorld).registeredWhen(() => this.isInNether()) + + this.registerForge(net.minecraftforge.event.entity.EntityJoinWorldEvent, this.entityJoinWorldEvent).registeredWhen(() => this.isInDojo()); + this.registerEvent("tick", this.tick).registeredWhen(() => this.isInNether()) this.registerChat("&r&r&r &r&aTest of Swiftness &r&e&lOBJECTIVES&r", () => { if (this.speedNextBlock.getValue()) { this.inSwiftness = true @@ -4,7 +4,7 @@ class Logger { constructor() { this.isDev = isDev() - this.loglevel = this.isDev ? 4 : 2 //0=none, 1=error, 2=warn, 3=info, 4=debug + this.loglevel = this.isDev ? 3 : 2 //0=none, 1=error, 2=warn, 3=info, 4=debug this.logToMcChat = false this.logPrefixes = [ "[SOOPYADDONS] ", diff --git a/socketConnection.js b/socketConnection.js index 8750336..1c1a792 100644 --- a/socketConnection.js +++ b/socketConnection.js @@ -27,8 +27,6 @@ class SoopyV2Server extends WebsiteCommunicator { this.cookieData = undefined this.cookieDataUpdated = 0 - this.inApiQ = false - this.chEvent = ["???", "???"] register("step", () => { @@ -40,9 +38,6 @@ class SoopyV2Server extends WebsiteCommunicator { } joinApiQ() { - if (this.inApiQ) return - this.inApiQ = true - this.sendData({ type: "apiready" }) @@ -114,7 +109,6 @@ class SoopyV2Server extends WebsiteCommunicator { this.chEvent = data.event } if (data.type === "api") { - this.inApiQ = false if (this.apithingo) this.apithingo(data.uuid, data.packetId) } @@ -130,7 +124,6 @@ class SoopyV2Server extends WebsiteCommunicator { }) }) this.errorsToReport = [] - this.inApiQ = false } updateCosmeticsData(data) { |