From b8db01c32f2936728dde3a6f68711e9e0fce5bed Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:14:04 +0100 Subject: utilizing location.add(x = x) --- .../hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt | 2 +- .../skyhanni/features/slayer/SlayerMiniBossFeatures.kt | 2 +- .../skyhanni/features/slayer/VampireSlayerFeatures.kt | 10 +++++----- .../features/slayer/enderman/EndermanSlayerFeatures.kt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/slayer') diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt index 0cb129c7d..f0f80ace4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt @@ -32,7 +32,7 @@ class SlayerItemsOnGround { if (!SlayerAPI.hasActiveSlayerQuest()) return for (entityItem in EntityUtils.getEntities()) { - val location = event.exactLocation(entityItem).add(0.0, 0.8, 0.0) + val location = event.exactLocation(entityItem).add(y = 0.8) if (location.distance(LocationUtils.playerLocation()) > 15) continue val itemStack = entityItem.entityItem diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt index f45d352b5..e384b5de8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerMiniBossFeatures.kt @@ -60,7 +60,7 @@ class SlayerMiniBossFeatures { event.draw3DLine( event.exactPlayerEyeLocation(), - mob.getLorenzVec().add(0, 1, 0), + mob.getLorenzVec().add(y = 1), LorenzColor.AQUA.toColor(), 3, true diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt index 04275f1a9..e1f837a7b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt @@ -291,7 +291,7 @@ object VampireSlayerFeatures { if (distance <= 15) { event.draw3DLine( event.exactPlayerEyeLocation(), - vec.add(0.0, 1.54, 0.0), + vec.add(y = 1.54), config.lineColor.toChromaColor(), config.lineWidth, true @@ -319,7 +319,7 @@ object VampireSlayerFeatures { (if (isIchor) configBloodIcor.linesColor else configKillerSpring.linesColor).toChromaColor() val text = if (isIchor) "§4Ichor" else "§4Spring" event.drawColor( - stand.position.toLorenzVec().add(0.0, 2.0, 0.0), + stand.position.toLorenzVec().add(y = 2.0), LorenzColor.DARK_RED, alpha = 1f ) @@ -332,8 +332,8 @@ object VampireSlayerFeatures { for ((player, stand2) in standList) { if ((configBloodIcor.showLines && isIchor) || (configKillerSpring.showLines && isSpring)) event.draw3DLine( - event.exactLocation(player).add(0.0, 1.5, 0.0), - event.exactLocation(stand2).add(0.0, 1.5, 0.0), + event.exactLocation(player).add(y = 1.5), + event.exactLocation(stand2).add(y = 1.5), // stand2.position.toLorenzVec().add(0.0, 1.5, 0.0), linesColorStart, 3, @@ -343,7 +343,7 @@ object VampireSlayerFeatures { } if (configBloodIcor.renderBeam && isIchor && stand.isEntityAlive) { event.drawWaypointFilled( - event.exactLocation(stand).add(0, -2, 0), + event.exactLocation(stand).add(0, y = -2, 0), configBloodIcor.color.toChromaColor(), beacon = true ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt index 42c50f00a..cd0de443e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt @@ -129,14 +129,14 @@ class EndermanSlayerFeatures { val durationFormat = duration.format(showMilliSeconds = true) event.drawColor(location, beaconConfig.beaconColor.toChromaColor(), alpha = 1f) event.drawWaypointFilled(location, beaconConfig.beaconColor.toChromaColor(), true, true) - event.drawDynamicText(location.add(0, 1, 0), "§4Beacon §b$durationFormat", 1.8) + event.drawDynamicText(location.add(y = 1), "§4Beacon §b$durationFormat", 1.8) } } for (beacon in flyingBeacons) { if (beacon.isDead) continue if (beaconConfig.highlightBeacon) { val beaconLocation = event.exactLocation(beacon) - event.drawDynamicText(beaconLocation.add(0, 1, 0), "§4Beacon", 1.8) + event.drawDynamicText(beaconLocation.add(y = 1), "§4Beacon", 1.8) } if (beaconConfig.showLine) { -- cgit