diff options
Diffstat (limited to 'features')
| -rw-r--r-- | features/dungeonSolvers/index.js | 19 | ||||
| -rw-r--r-- | features/globalSettings/index.js | 3 | ||||
| -rw-r--r-- | features/nether/index.js | 2 | ||||
| -rw-r--r-- | features/slayers/index.js | 1 |
4 files changed, 13 insertions, 12 deletions
diff --git a/features/dungeonSolvers/index.js b/features/dungeonSolvers/index.js index 21730ad..48c4766 100644 --- a/features/dungeonSolvers/index.js +++ b/features/dungeonSolvers/index.js @@ -157,6 +157,7 @@ class DungeonSolvers extends Feature { this.blazes = []; this.blazeX = -1; this.blazeY = -1; + this.timersData = [] this.dungeonSecretRquired = { 1: 0.3, @@ -181,7 +182,7 @@ class DungeonSolvers extends Feature { this.registerStep(true, 2, this.step).registeredWhen(() => this.isInDungeon()); this.registerStep(false, 60, this.step) this.registerStep(true, 10, this.step2).registeredWhen(() => this.isInDungeon()); - this.registerStep(true, 5, this.step_5fps).registeredWhen(() => this.isInDungeon()); + this.registerStep(true, 1, this.step_1fps).registeredWhen(() => this.isInDungeon()); this.registerStep(false, 60 * 5, this.step_5min) this.registerEvent("worldLoad", this.onWorldLoad); @@ -201,7 +202,7 @@ class DungeonSolvers extends Feature { this.goneInBonus = true; }) }); - let enteredBossMessages = ["&r&4[BOSS] Maxor&r&c: &r&cWELL WELL WELL LOOK WHO’S HERE!&r", "&r&c[BOSS] Livid&r&f: Welcome, you arrive right on time. I am Livid, the Master of Shadows.&r", "&r&c[BOSS] Thorn&r&f: Welcome Adventurers! I am Thorn, the Spirit! And host of the Vegan Trials!&r", "&r&c[BOSS] The Professor&r&f: I was burdened with terrible news recently...&r", "&r&c[BOSS] Scarf&r&f: This is where the journey ends for you, Adventurers.&r", "&r&c[BOSS] Bonzo&r&f: Gratz for making it this far, but I’m basically unbeatable.&r", "&r&c[BOSS] Sadan&r&f: So you made it all the way &r&fhere...and&r&f you wish to defy me? Sadan?!&r"] + let enteredBossMessages = ["[BOSS] Maxor: WELL WELL WELL LOOK WHO’S HERE!", "[BOSS] Livid: Welcome, you arrive right on time. I am Livid, the Master of Shadows.", "[BOSS] Thorn: Welcome Adventurers! I am Thorn, the Spirit! And host of the Vegan Trials!", "[BOSS] The Professor: I was burdened with terrible news recently...", "[BOSS] Scarf: This is where the journey ends for you, Adventurers.", "[BOSS] Bonzo: Gratz for making it this far, but I’m basically unbeatable.", "[BOSS] Sadan: So you made it all the way here...and you wish to defy me? Sadan?!"] enteredBossMessages.forEach(msg => { this.registerChat(msg, () => { this.goneInBonus = false; @@ -260,8 +261,8 @@ class DungeonSolvers extends Feature { }); this.registerForge(net.minecraftforge.event.entity.EntityJoinWorldEvent, this.entityJoinWorldEvent).registeredWhen(() => this.isInDungeon() && !this.inBoss); - // this.registerEvent("renderEntity", this.renderEntity) - this.renderEntityEvent = undefined; + + this.renderEntityEvent = this.registerEvent("renderEntity", this.renderEntity); this.onWorldLoad(); @@ -360,7 +361,6 @@ class DungeonSolvers extends Feature { packetRecieved.trigger.setPacketClasses([net.minecraft.network.play.server.S23PacketBlockChange, net.minecraft.network.play.server.S22PacketMultiBlockChange]) } catch (e) { }//older ct version - this.timersData = [] } getCurrentRoomId() { if (Scoreboard.getLines().length === 0) return @@ -987,13 +987,12 @@ class DungeonSolvers extends Feature { } if (this.lividData.correctLividEntity) { - if (!this.renderEntityEvent) { - this.renderEntityEvent = this.registerEvent("renderEntity", this.renderEntity); + if (!this.renderEntityEvent.enabled) { + this.renderEntityEvent.register() } } else { - if (this.renderEntityEvent) { + if (this.renderEntityEvent.enabled) { this.renderEntityEvent.unregister() - this.renderEntityEvent = undefined; } } @@ -1038,7 +1037,7 @@ class DungeonSolvers extends Feature { } } - step_5fps() { + step_1fps() { if (this.IceSprayWarn.getValue()) { World.getAllEntitiesOfType(net.minecraft.entity.item.EntityArmorStand).forEach((name) => { let MobName = ChatLib.removeFormatting(name.getName()) diff --git a/features/globalSettings/index.js b/features/globalSettings/index.js index 25b2eaf..8ce9f7e 100644 --- a/features/globalSettings/index.js +++ b/features/globalSettings/index.js @@ -141,8 +141,9 @@ class GlobalSettings extends Feature { this.registerEvent("messageSent", (message, event) => { if (!this.twitchCommands.getValue()) return - if (message.startsWith("-")) { + if (message.startsWith("-") && message[1].toLowerCase().match(/[a-z]/)) { cancel(event) + ChatLib.addToSentMessageHistory(message) fetch("http://soopy.dev/api/soopyv2/botcommand?m=" + encodeURIComponent(message.replace("-", "")) + "&u=" + Player.getName()).text(text => { ChatLib.chat(this.FeatureManager.messagePrefix + "&7" + message) let sendMessage = text diff --git a/features/nether/index.js b/features/nether/index.js index d63cf0e..26aea22 100644 --- a/features/nether/index.js +++ b/features/nether/index.js @@ -65,7 +65,7 @@ class Nether extends Feature { 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) + this.registerEvent("tick", this.tick).registeredWhen(() => this.isInNether()) this.todoE = [] this.todoE2 = [] diff --git a/features/slayers/index.js b/features/slayers/index.js index e0ce0a8..3155e53 100644 --- a/features/slayers/index.js +++ b/features/slayers/index.js @@ -321,6 +321,7 @@ class Slayers extends Feature { } entityAttackEvent(event) { + ChatLib.chat("ENTITY ATTACKING") if (event.source.func_76346_g() === Player.getPlayer()) { if (event.entity instanceof net.minecraft.entity.monster.EntityEnderman) { World.getAllEntitiesOfType(net.minecraft.entity.item.EntityArmorStand).forEach((e) => { |