aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-05-26 22:26:24 +1000
committerGitHub <noreply@github.com>2024-05-26 14:26:24 +0200
commit0ddd9edc94bc0c872109acd0b845163b073ceb6a (patch)
treee8cad5d9d86105dfce6809489c9f6409a3a5ffc2 /src/main/java/at/hannibal2/skyhanni/features
parent573e8452bf2e9a3e1ca94f736c2b441796ad4b92 (diff)
downloadskyhanni-0ddd9edc94bc0c872109acd0b845163b073ceb6a.tar.gz
skyhanni-0ddd9edc94bc0c872109acd0b845163b073ceb6a.tar.bz2
skyhanni-0ddd9edc94bc0c872109acd0b845163b073ceb6a.zip
Backend: Use less deprecated LorenzVec functions (#1556)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt2
6 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
index 73fbc21a5..535e8d4a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
@@ -184,8 +184,8 @@ class SoopyGuessBurrow {
val pr2 = mutableListOf<LorenzVec>()
val start = slopeThing.size - 1
- val lastPos = locs[start].multiply(1).toDoubleArray()
- val lastPos2 = locs[start].multiply(1).toDoubleArray()
+ val lastPos = locs[start].toDoubleArray()
+ val lastPos2 = locs[start].toDoubleArray()
var distCovered = 0.0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
index 968601e92..c2c395c1a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestParticleWaypoint.kt
@@ -177,9 +177,9 @@ class PestParticleWaypoint {
val list = locations.toList()
var pos = LorenzVec(0.0, 0.0, 0.0)
for ((i, particle) in list.withIndex()) {
- pos = pos.add(particle.subtract(firstParticle).divide(i.toDouble() + 1.0))
+ pos += (particle - firstParticle) / (i.toDouble() + 1.0)
}
- return firstParticle.add(pos.multiply(120.0 / list.size))
+ return firstParticle + pos * (120.0 / list.size)
}
fun isEnabled() = GardenAPI.inGarden() && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
index 9c612695d..586521b4b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown
import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
import at.hannibal2.skyhanni.utils.LorenzColor
-import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.round
import at.hannibal2.skyhanni.utils.NEUInternalName
import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
index c98a32a68..7eba48a4d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
@@ -134,7 +134,7 @@ class MinionXp {
)
return positionsToCheck.any { position ->
- val pos = minionPosition.add(position).toBlockPos()
+ val pos = (minionPosition + position).toBlockPos()
val block = Minecraft.getMinecraft().theWorld.getBlockState(pos).block
block is BlockChest
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
index c1420bc8c..12503c29d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt
@@ -1,9 +1,9 @@
package at.hannibal2.skyhanni.features.misc.massconfiguration
+import io.github.moulberry.notenoughupdates.util.Utils
import io.github.notenoughupdates.moulconfig.internal.GlScissorStack
import io.github.notenoughupdates.moulconfig.internal.RenderUtils
import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils
-import io.github.moulberry.notenoughupdates.util.Utils
import net.minecraft.client.gui.GuiScreen
import net.minecraft.client.gui.ScaledResolution
import net.minecraft.client.renderer.GlStateManager
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
index 057c0dfdc..f56185aba 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
@@ -1,10 +1,10 @@
package at.hannibal2.skyhanni.features.misc.update
import at.hannibal2.skyhanni.SkyHanniMod
+import io.github.moulberry.notenoughupdates.itemeditor.GuiElementButton
import io.github.notenoughupdates.moulconfig.gui.GuiOptionEditor
import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils
import io.github.notenoughupdates.moulconfig.processor.ProcessedOption
-import io.github.moulberry.notenoughupdates.itemeditor.GuiElementButton
import net.minecraft.client.Minecraft
import net.minecraft.client.renderer.GlStateManager
import net.minecraft.util.EnumChatFormatting.GREEN