+ Soulflow counter checks using api so it works even when talisman is in talisman bag

+ Dojo tenacity lines for fireballs
+ Dojo mastery line for lines to next wool

1 files changed, 56 insertions, 6 deletions

diff --git a/features/nether/index.js b/features/nether/index.js
index e0c5cd3..4eb6fab 100644
--- a/features/nether/index.js
+++ b/features/nether/index.js
@@ -1,10 +1,12 @@
 /// <reference types="../../../CTAutocomplete" />
 /// <reference lib="es2015" />
-import { m } from "../../../mappings/mappings";
+import { f, m } from "../../../mappings/mappings";
 import Feature from "../../featureClass/class";
-import { drawBoxAtBlock, drawLine } from "../../utils/renderUtils";
+import { drawBoxAtBlock, drawBoxAtEntity, drawLine, drawLineWithDepth, renderBeaconBeam } from "../../utils/renderUtils";
 import ToggleSetting from "../settings/settingThings/toggle";
 const MCBlock = Java.type("net.minecraft.block.Block");
+const ArmorStand = Java.type("net.minecraft.entity.item.EntityArmorStand")
+const MCItem = Java.type("net.minecraft.item.Item");
 
 class Nether extends Feature {
 	constructor() {
@@ -16,13 +18,20 @@ 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)
 
 		this.registerCustom("packetReceived", this.packetReceived)
 
 		this.registerStep(true, 1, this.step1S)
 		this.registerEvent("renderWorld", this.renderWorld)
 
+		this.registerForge(net.minecraftforge.event.entity.EntityJoinWorldEvent, this.entityJoinWorldEvent);
+		this.registerEvent("tick", this.tick)
+
+		this.todoE = []
+		this.todoE2 = []
 		this.blocks = []
+		this.dojoFireBalls = []
 		this.inSwiftness = false
 		this.lastBlock = undefined
 		this.registerChat("&r&r&r                    &r&aTest of Swiftness &r&e&lOBJECTIVES&r", () => {
@@ -37,6 +46,23 @@ class Nether extends Feature {
 		})
 	}
 
+	tick() {
+		this.todoE2.forEach(e => {
+			let item = e[m.getHeldItem]()
+			if (!item) return
+			if (MCItem[m.getIdFromItem](item[m.getItem.ItemStack]()) !== 173) return
+
+			this.dojoFireBalls.push(e)
+		})
+
+		this.todoE2 = this.todoE
+		this.todoE = []
+	}
+
+	entityJoinWorldEvent(event) {
+		if (this.tenacityLine.getValue() && event.entity instanceof ArmorStand) this.todoE.push(event.entity)
+	}
+
 	packetReceived(packet, event) {
 		if (!this.masteryTimer.getValue()) return
 		let packetType = new String(packet.class.getSimpleName()).valueOf()
@@ -71,23 +97,47 @@ class Nether extends Feature {
 				if (oldBlockState === 0 && blockState === 20515 && this.inSwiftness) {
 					this.lastBlock = [position.getX(), position.getY(), position.getZ()]
 				}
+				if (oldBlockState === 20515 && blockState === 16419) {
+					this.blocks.push({ loc: position, time: Date.now() + 3000 })
+				}
+				if (blockState === 57379) {
+					this.blocks = this.blocks.filter(b => {
+						if (b.loc.x === position.x && b.loc.y === position.y && b.loc.z === position.z) {
+							return false
+						}
+						return true
+					})
+					//air=0
+					//green=20515
+					//yellow=16419
+					//red=57379
+				}
 			})
 		}
 	}
 
 	renderWorld(event) {
 		if (this.masteryTimer.getValue()) {
-			this.blocks.forEach(data => {
-				Tessellator.drawString(Math.max(0, (data.time - Date.now()) / 1000).toFixed(1) + "s", data.loc.getX() + 0.5, data.loc.getY() + 0.5, data.loc.getZ() + 0.5, 0, false, 0.05, false)
+			this.blocks.forEach((data, i) => {
+				Tessellator.drawString((i === 0 ? "§1" : "§0") + Math.max(0, (data.time - Date.now()) / 1000).toFixed(1) + "s", data.loc.getX() + 0.5, data.loc.getY() + 0.5, data.loc.getZ() + 0.5, 0, false, 0.05, false)
 			})
-			if (this.blocks.length >= 2) drawLine(this.blocks[0].loc.getX(), this.blocks[0].loc.getY(), this.blocks[0].loc.getZ(), this.blocks[1].loc.getX(), this.blocks[1].loc.getY(), this.blocks[1].loc.getZ(), 255, 0, 0)
+			if (this.blocks.length >= 2) drawLine(this.blocks[0].loc.getX() + 0.5, this.blocks[0].loc.getY(), this.blocks[0].loc.getZ() + 0.5, this.blocks[1].loc.getX() + 0.5, this.blocks[1].loc.getY(), this.blocks[1].loc.getZ() + 0.5, 255, 0, 0)
 		}
 
 		if (this.lastBlock && this.inSwiftness) drawBoxAtBlock(this.lastBlock[0], this.lastBlock[1], this.lastBlock[2], 0, 255, 0, 1, 1)
+
+		if (this.tenacityLine.getValue()) this.dojoFireBalls.forEach(e => {
+			let offset = [e[f.width.Entity] / 2, e[f.height.Entity] / 2, e[f.width.Entity] / 2]
+			let entitylocation = [e[f.posX.Entity], e[f.posY.Entity], e[f.posZ.Entity]]
+			let lastLocation = [e[f.prevPosX], e[f.prevPosY], e[f.prevPosZ]]
+			let change = [entitylocation[0] - lastLocation[0], entitylocation[1] - lastLocation[1], entitylocation[2] - lastLocation[2]]
+			drawLineWithDepth(entitylocation[0] + change[0] * 100 + offset[0], entitylocation[1] + change[1] * 100 + offset[1], entitylocation[2] + change[2] * 100 + offset[2], entitylocation[0] + offset[0], entitylocation[1] + offset[1], entitylocation[2] + offset[2], 255, 0, 0, 2)
+		})
 	}
 
 	step1S() {
-		this.blocks = this.blocks.filter(state => Date.now() < state.time)
+		if (this.blocks) this.blocks = this.blocks.filter(state => Date.now() < state.time)
+		if (this.dojoFireBalls) this.dojoFireBalls = this.dojoFireBalls.filter(e => !e[f.isDead])
 	}
 
 	getBlockIdFromState(state) {