Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve search efficiency #555

Merged
merged 1 commit into from
Jul 12, 2023
Merged

improve search efficiency #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 43 additions & 12 deletions src/main/kotlin/com/lambda/client/module/modules/render/Search.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ import com.lambda.client.util.graphics.ESPRenderer
import com.lambda.client.util.graphics.GeometryMasks
import com.lambda.client.util.graphics.LambdaTessellator
import com.lambda.client.util.graphics.ShaderHelper
import com.lambda.client.util.math.VectorUtils.distanceTo
import com.lambda.client.util.items.id
import com.lambda.client.util.math.VectorUtils.manhattanDistanceTo
import com.lambda.client.util.text.MessageSendHelper
import com.lambda.client.util.text.formatValue
import com.lambda.client.util.threads.defaultScope
import com.lambda.client.util.threads.runSafe
import com.lambda.client.util.threads.safeListener
import com.lambda.client.util.world.isWater
import it.unimi.dsi.fastutil.ints.IntOpenHashSet
import kotlinx.coroutines.Job
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
Expand All @@ -38,11 +40,13 @@ import net.minecraft.init.Blocks
import net.minecraft.network.play.server.SPacketBlockChange
import net.minecraft.network.play.server.SPacketMultiBlockChange
import net.minecraft.tileentity.TileEntitySign
import net.minecraft.util.ResourceLocation
import net.minecraft.util.math.BlockPos
import net.minecraft.util.math.ChunkPos
import net.minecraft.util.text.TextComponentString
import net.minecraft.world.chunk.Chunk
import net.minecraftforge.fml.common.gameevent.TickEvent
import net.minecraftforge.fml.common.registry.ForgeRegistries
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ConcurrentMap
import kotlin.collections.set
Expand Down Expand Up @@ -80,6 +84,7 @@ object Search : Module(

var overrideWarning by setting("Override Warning", false, { false })
val blockSearchList = setting(CollectionSetting("Search List", defaultSearchList, { false }))
private var blockSearchIdHashSet: IntOpenHashSet = IntOpenHashSet()
val entitySearchList = setting(CollectionSetting("Entity Search List", linkedSetOf(EntityList.getKey((EntityItemFrame::class.java))!!.path), { false }))
val blockSearchDimensionFilter = setting(CollectionSetting("Block Dimension Filter", linkedSetOf(), entryType = DimensionFilter::class.java, visibility = { false }))
val entitySearchDimensionFilter = setting(CollectionSetting("Entity Dimension Filter", linkedSetOf(), entryType = DimensionFilter::class.java, visibility = { false }))
Expand Down Expand Up @@ -139,6 +144,10 @@ object Search : Module(
}

safeListener<TickEvent.ClientTickEvent> {
if (blockSearchIdHashSet.size != blockSearchList.size) {
updateBlockSearchIdSet()
defaultScope.launch { searchAllLoadedChunks() }
}
if (blockRenderUpdateJob == null || blockRenderUpdateJob?.isCompleted == true) {
blockRenderUpdateJob = defaultScope.launch {
blockRenderUpdate()
Expand Down Expand Up @@ -175,17 +184,28 @@ object Search : Module(
}

safeListener<ConnectionEvent.Disconnect> {
blockRenderer.clear()
entityRenderer.clear()
blockRenderer.replaceAll(mutableListOf()) // safe replace during possible iterator to prevent crashes
entityRenderer.replaceAll(mutableListOf())
foundBlockMap.clear()
}
}

private fun blockSearchListUpdateListener(newBool: Boolean) {
foundBlockMap.entries
.filterNot { blockSearchList.contains(it.value.block.registryName.toString()) }
.filterNot { blockSearchIdHashSet.contains(it.value.block.id) }
.forEach { foundBlockMap.remove(it.key) }
if (newBool) runSafe { searchAllLoadedChunks() }
if (newBool) runSafe {
updateBlockSearchIdSet()
searchAllLoadedChunks()
}
}

private fun updateBlockSearchIdSet() {
val idSet = IntOpenHashSet()
blockSearchList.forEach {
idSet.add(ForgeRegistries.BLOCKS.getValue(ResourceLocation(it))?.id)
}
blockSearchIdHashSet = idSet
}

private fun SafeClientEvent.searchLoadedEntities() {
Expand All @@ -201,9 +221,9 @@ object Search : Module(
entitySearchDimensionFilter.value.find { dimFilter -> dimFilter.searchKey == entityName }?.dim
}?.contains(player.dimension) ?: true
}
.sortedBy { it.distanceTo(player.getPositionEyes(1f)) }
.sortedBy { it.manhattanDistanceTo(player.position) }
.take(maximumEntities)
.filter { it.distanceTo(player.getPositionEyes(1f)) < range }
.filter { it.manhattanDistanceTo(player.position) < range }
.map {
Triple(
it.renderBoundingBox.offset(EntityUtils.getInterpolatedAmount(it, LambdaTessellator.pTicks())),
Expand Down Expand Up @@ -252,7 +272,7 @@ object Search : Module(
// unload rendering on block pos > range
foundBlockMap
.filter {
playerPos.distanceTo(it.key) > max(mc.gameSettings.renderDistanceChunks * 16, range)
playerPos.manhattanDistanceTo(it.key) > max(mc.gameSettings.renderDistanceChunks * 16, range)
}
.map { it.key }
.forEach { foundBlockMap.remove(it) }
Expand All @@ -261,11 +281,11 @@ object Search : Module(
.filter {
blockSearchDimensionFilter.value
.find {
dimFilter -> dimFilter.searchKey == it.value.block.registryName.toString()
dimFilter -> dimFilter.getId() == it.value.block.id
}?.dim?.contains(player.dimension) ?: true
}
.map {
player.getPositionEyes(1f).distanceTo(it.key) to it.key
player.position.manhattanDistanceTo(it.key) to it.key
}
.filter { it.first < range }
.take(maximumBlocks)
Expand Down Expand Up @@ -322,9 +342,9 @@ object Search : Module(
private fun SafeClientEvent.searchQuery(state: IBlockState, pos: BlockPos): Boolean {
val block = state.block
if (block == Blocks.AIR) return false
return (blockSearchList.contains(block.registryName.toString())
return (blockSearchIdHashSet.contains(block.id)
&& blockSearchDimensionFilter.value.find { dimFilter ->
dimFilter.searchKey == block.registryName.toString()
dimFilter.getId() == block.id
}?.dim?.contains(player.dimension) ?: true)
|| isIllegalBedrock(state, pos)
|| isIllegalWater(state)
Expand Down Expand Up @@ -395,6 +415,17 @@ object Search : Module(
}

data class DimensionFilter(val searchKey: String, val dim: LinkedHashSet<Int>) {
private var id: Int? = null
private var idInitTried = false // need to do this whole thing because gson doesn't init this field

fun getId(): Int? {
if (id == null && !idInitTried) {
idInitTried = true
id = ForgeRegistries.BLOCKS.getValue(ResourceLocation(searchKey))?.id
}
return id
}

override fun toString(): String {
return "$searchKey -> $dim"
}
Expand Down
32 changes: 32 additions & 0 deletions src/main/kotlin/com/lambda/client/util/math/VectorUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,31 +112,63 @@ object VectorUtils {
return sqrt((xDiff * xDiff + yDiff * yDiff + zDiff * zDiff).toDouble())
}

fun Vec3i.manhattanDistanceTo(vec3i: Vec3i): Int {
val xDiff = abs(vec3i.x - x)
val yDiff = abs(vec3i.y - y)
val zDiff = abs(vec3i.z - z)
return xDiff + yDiff + zDiff
}

fun Vec3d.distanceTo(vec3i: Vec3i): Double {
val xDiff = vec3i.x + 0.5 - x
val yDiff = vec3i.y + 0.5 - y
val zDiff = vec3i.z + 0.5 - z
return sqrt(xDiff * xDiff + yDiff * yDiff + zDiff * zDiff)
}

fun Vec3d.manhattanDistanceTo(vec3i: Vec3i): Double {
val xDiff = abs(vec3i.x + 0.5 - x)
val yDiff = abs(vec3i.y + 0.5 - y)
val zDiff = abs(vec3i.z + 0.5 - z)
return xDiff + yDiff + zDiff
}

fun Entity.distanceTo(vec3i: Vec3i): Double {
val xDiff = vec3i.x + 0.5 - posX
val yDiff = vec3i.y + 0.5 - posY
val zDiff = vec3i.z + 0.5 - posZ
return sqrt(xDiff * xDiff + yDiff * yDiff + zDiff * zDiff)
}

fun Entity.manhattanDistanceTo(vec3i: Vec3i): Double {
val xDiff = abs(vec3i.x + 0.5 - posX)
val yDiff = abs(vec3i.y + 0.5 - posY)
val zDiff = abs(vec3i.z + 0.5 - posZ)
return xDiff + yDiff + zDiff
}

fun Entity.distanceTo(vec3d: Vec3d): Double {
val xDiff = vec3d.x - posX
val yDiff = vec3d.y - posY
val zDiff = vec3d.z - posZ
return sqrt(xDiff * xDiff + yDiff * yDiff + zDiff * zDiff)
}

fun Entity.manhattanDistanceTo(vec3d: Vec3d): Double {
val xDiff = abs(vec3d.x - posX)
val yDiff = abs(vec3d.y - posY)
val zDiff = abs(vec3d.z - posZ)
return xDiff + yDiff + zDiff
}

fun Entity.distanceTo(chunkPos: ChunkPos): Double {
return hypot(chunkPos.x * 16 + 8 - posX, chunkPos.z * 16 + 8 - posZ)
}

fun Entity.manhattanDistanceTo(chunkPos: ChunkPos): Double {
return abs(chunkPos.x * 16 + 8 - posX) + abs(chunkPos.z * 16 + 8 - posZ)
}

fun Vec3i.multiply(multiplier: Int): Vec3i {
return Vec3i(x * multiplier, y * multiplier, z * multiplier)
}
Expand Down