aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-10 04:33:56 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-10 04:33:56 +0100
commitc1ccf0ef9b7e3672bc295f9aa124d4415ed8588e (patch)
treeaf63a05e7004974b2ebe843eec547748baac7ac2
parent873378ed823de01b4be4900c0f4893acb1e97f03 (diff)
downloadskyhanni-c1ccf0ef9b7e3672bc295f9aa124d4415ed8588e.tar.gz
skyhanni-c1ccf0ef9b7e3672bc295f9aa124d4415ed8588e.tar.bz2
skyhanni-c1ccf0ef9b7e3672bc295f9aa124d4415ed8588e.zip
Fixed toBlocPos -> toBlockPos
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt2
6 files changed, 12 insertions, 14 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
index e87257e98..d97f1b327 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@@ -61,7 +61,7 @@ class DungeonHighlightClickedBlocks {
}
if (type == ClickedBlockType.WITHER_ESSENCE) {
- val text = BlockUtils.getTextureFromSkull(position.toBlocPos())
+ val text = BlockUtils.getTextureFromSkull(position.toBlockPos())
if (text != "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQ" +
"ubmV0L3RleHR1cmUvYzRkYjRhZGZhOWJmNDhmZjVkNDE3M" +
"DdhZTM0ZWE3OGJkMjM3MTY1OWZjZDhjZDg5MzQ3NDlhZjRjY2U5YiJ9fX0="
@@ -97,4 +97,4 @@ class DungeonHighlightClickedBlocks {
CHEST("Chest"),
WITHER_ESSENCE("Wither Essence"),
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 1b23bb1de..a28358143 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -35,7 +35,7 @@ class GriffinBurrowParticleFinder {
val particleType = ParticleType.getParticleType(packet)
if (particleType != null) {
- val location = packet.toLorenzVec().toBlocPos().down().toLorenzVec()
+ val location = packet.toLorenzVec().toBlockPos().down().toLorenzVec()
if (recentlyDugParticleBurrows.contains(location)) return
val burrow = burrows.getOrPut(location) { Burrow(location) }
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 6f3ce2ce7..92f7d8e3e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
@@ -140,7 +140,7 @@ class MinionXp {
)
return positionsToCheck.any { position ->
- val pos = minionPosition.add(position).toBlocPos()
+ val pos = minionPosition.add(position).toBlockPos()
val block = Minecraft.getMinecraft().theWorld.getBlockState(pos).block
block is BlockChest
}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
index 5b8c8a0c0..724ed3dd7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt
@@ -14,10 +14,10 @@ object BlockUtils {
getBlockStateAt().block
fun LorenzVec.getBlockStateAt(): IBlockState =
- Minecraft.getMinecraft().theWorld.getBlockState(toBlocPos())
+ Minecraft.getMinecraft().theWorld.getBlockState(toBlockPos())
fun LorenzVec.isInLoadedChunk(): Boolean =
- Minecraft.getMinecraft().theWorld.chunkProvider.provideChunk(toBlocPos()).isLoaded
+ Minecraft.getMinecraft().theWorld.chunkProvider.provideChunk(toBlockPos()).isLoaded
fun getTextureFromSkull(position: BlockPos?): String? {
val entity = Minecraft.getMinecraft().theWorld.getTileEntity(position) as TileEntitySkull
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 427d5e48b..36c01c64d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -35,8 +35,8 @@ object EntityUtils {
debugWrongEntity: Boolean = false,
): List<EntityArmorStand> {
val center = getLorenzVec().add(y = y)
- val a = center.add(-inaccuracy, -inaccuracy - 3, -inaccuracy).toBlocPos()
- val b = center.add(inaccuracy, inaccuracy + 3, inaccuracy).toBlocPos()
+ val a = center.add(-inaccuracy, -inaccuracy - 3, -inaccuracy).toBlockPos()
+ val b = center.add(inaccuracy, inaccuracy + 3, inaccuracy).toBlockPos()
val alignedBB = AxisAlignedBB(a, b)
val clazz = EntityArmorStand::class.java
val found = worldObj.getEntitiesWithinAABB(clazz, alignedBB)
@@ -59,8 +59,8 @@ object EntityUtils {
radius: Double = 3.0,
): List<EntityArmorStand> {
val center = getLorenzVec().add(y = 3)
- val a = center.add(-radius, -radius - 3, -radius).toBlocPos()
- val b = center.add(radius, radius + 3, radius).toBlocPos()
+ val a = center.add(-radius, -radius - 3, -radius).toBlockPos()
+ val b = center.add(radius, radius + 3, radius).toBlockPos()
val alignedBB = AxisAlignedBB(a, b)
val clazz = EntityArmorStand::class.java
val found = worldObj.getEntitiesWithinAABB(clazz, alignedBB)
@@ -78,8 +78,8 @@ object EntityUtils {
debugWrongEntity: Boolean = false,
): EntityArmorStand? {
val center = getLorenzVec().add(y = y)
- val a = center.add(-inaccuracy, -inaccuracy - 3, -inaccuracy).toBlocPos()
- val b = center.add(inaccuracy, inaccuracy + 3, inaccuracy).toBlocPos()
+ val a = center.add(-inaccuracy, -inaccuracy - 3, -inaccuracy).toBlockPos()
+ val b = center.add(inaccuracy, inaccuracy + 3, inaccuracy).toBlockPos()
val alignedBB = AxisAlignedBB(a, b)
val clazz = EntityArmorStand::class.java
val found = worldObj.getEntitiesWithinAABB(clazz, alignedBB)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
index 2a35a488a..ba337b620 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt
@@ -23,8 +23,6 @@ data class LorenzVec(
constructor(x: Float, y: Float, z: Float) : this(x.toDouble(), y.toDouble(), z.toDouble())
- @Deprecated("Misspelled function name", replaceWith = ReplaceWith("toBlockPos()"))
- fun toBlocPos(): BlockPos = toBlockPos()
fun toBlockPos(): BlockPos = BlockPos(x, y, z)
fun toVec3(): Vec3 = Vec3(x, y, z)