DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix blockposset subset forgetting blocks at negative y values

Browse Source
This commit is contained in:
DBotThePony 2025-03-25 14:13:19 +07:00
parent d08a928e04
commit 727111cf4a
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 104 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/BlockPosSet.kt
View File

@ -88,7 +88,7 @@ class BlockPosSet : MutableSet<BlockPos> {
fun subset(pos: ChunkPos): Set<BlockPos> { fun subset(pos: ChunkPos): Set<BlockPos> {
val result = BlockPosSet() val result = BlockPosSet()
for (key in segments.keys.iterator(SectionPos.of(pos.x, 0, pos.z))) { for (key in segments.keys.iterator(SectionPos.of(pos.x, Int.MIN_VALUE, pos.z))) {
if (key.x != pos.x || key.z != pos.z) break if (key.x != pos.x || key.z != pos.z) break
result.segments[key] = segments[key] result.segments[key] = segments[key]
} }
@ -192,4 +192,16 @@ class BlockPosSet : MutableSet<BlockPos> {
override fun retainAll(elements: Collection<BlockPos>): Boolean { override fun retainAll(elements: Collection<BlockPos>): Boolean {
return removeIf { it !in elements } return removeIf { it !in elements }
} }
override fun equals(other: Any?): Boolean {
return this === other || other is Set<*> && other.size == size && other.containsAll(this)
}
override fun hashCode(): Int {
return segments.hashCode()
}
override fun toString(): String {
return "BlockPosSet[${joinToString(", ")}]"
}
} }

91
src/test/kotlin/ru/dbotthepony/mc/otm/tests/BlockPosSetTests.kt Normal file
View File

@ -0,0 +1,91 @@
package ru.dbotthepony.mc.otm.tests
import it.unimi.dsi.fastutil.objects.ObjectArraySet
import net.minecraft.core.BlockPos
import net.minecraft.core.SectionPos
import net.minecraft.world.level.ChunkPos
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.Test
import ru.dbotthepony.mc.otm.core.collect.BlockPosSet
import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource
import java.util.stream.Collectors
object BlockPosSetTests {
@Test
@DisplayName("BlockPosSet additions")
fun add() {
val rand = GJRAND64RandomSource(43752304058048234L, -29394036784594328L)
val positions = ObjectArraySet<BlockPos>()
for (i in 0 until 1000) {
val x = rand.nextInt(-200, 200)
val y = rand.nextInt(-200, 200)
val z = rand.nextInt(-200, 200)
positions.add(BlockPos(x, y, z))
}
val result = BlockPosSet()
result.addAll(positions)
Assertions.assertEquals(positions, result)
Assertions.assertEquals(positions, ObjectArraySet(result))
run {
val expected = positions.stream().filter { SectionPos.blockToSectionCoord(it.x) == 0 && SectionPos.blockToSectionCoord(it.z) == 0 }.collect(Collectors.toCollection(::ObjectArraySet))
val actual = result.subset(ChunkPos.ZERO)
Assertions.assertEquals(expected, actual)
Assertions.assertEquals(expected, ObjectArraySet(actual))
}
run {
val expected = positions.stream().filter { SectionPos.blockToSectionCoord(it.x) == 0 && SectionPos.blockToSectionCoord(it.z) == 1 }.collect(Collectors.toCollection(::ObjectArraySet))
val actual = result.subset(ChunkPos(0, 1))
Assertions.assertEquals(expected, actual)
Assertions.assertEquals(expected, ObjectArraySet(actual))
}
run {
val expected = positions.stream().filter { SectionPos.blockToSectionCoord(it.x) == 0 && SectionPos.blockToSectionCoord(it.z) == -1 }.collect(Collectors.toCollection(::ObjectArraySet))
val actual = result.subset(ChunkPos(0, -1))
Assertions.assertEquals(expected, actual)
Assertions.assertEquals(expected, ObjectArraySet(actual))
}
run {
val expected = positions.stream().filter { SectionPos.blockToSectionCoord(it.x) == 1 && SectionPos.blockToSectionCoord(it.z) == 0 }.collect(Collectors.toCollection(::ObjectArraySet))
val actual = result.subset(ChunkPos(1, 0))
Assertions.assertEquals(expected, actual)
Assertions.assertEquals(expected, ObjectArraySet(actual))
}
run {
val expected = positions.stream().filter { SectionPos.blockToSectionCoord(it.x) == -1 && SectionPos.blockToSectionCoord(it.z) == 0 }.collect(Collectors.toCollection(::ObjectArraySet))
val actual = result.subset(ChunkPos(-1, 0))
Assertions.assertEquals(expected, actual)
Assertions.assertEquals(expected, ObjectArraySet(actual))
}
run {
val expected = positions.stream().filter { SectionPos.blockToSectionCoord(it.x) == 1 && SectionPos.blockToSectionCoord(it.z) == 1 }.collect(Collectors.toCollection(::ObjectArraySet))
val actual = result.subset(ChunkPos(1, 1))
Assertions.assertEquals(expected, actual)
Assertions.assertEquals(expected, ObjectArraySet(actual))
}
run {
val expected = positions.stream().filter { SectionPos.blockToSectionCoord(it.x) == -1 && SectionPos.blockToSectionCoord(it.z) == 1 }.collect(Collectors.toCollection(::ObjectArraySet))
val actual = result.subset(ChunkPos(-1, 1))
Assertions.assertEquals(expected, actual)
Assertions.assertEquals(expected, ObjectArraySet(actual))
}
}
}