mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix client tests not starting

This commit is contained in:
Jonathan Coates 2024-04-22 20:39:40 +01:00
parent d7a1ba6f00
commit 9c60caf422
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/ClientTestHooks.kt
View File

@ -14,7 +14,7 @@
import net.minecraft.client.gui.screens.Screen
import net.minecraft.client.gui.screens.TitleScreen
import net.minecraft.client.tutorial.TutorialSteps
import net.minecraft.core.BlockPos
import net.minecraft.core.registries.Registries
import net.minecraft.gametest.framework.*
import net.minecraft.server.MinecraftServer
import net.minecraft.sounds.SoundSource
@ -92,7 +92,10 @@ private fun openWorld(screen: Screen) {
LEVEL_NAME,
LevelSettings("Test Level", GameType.CREATIVE, false, Difficulty.EASY, true, rules, WorldDataConfiguration.DEFAULT),
WorldOptions(WorldOptions.randomSeed(), false, false),
{ WorldPresets.createNormalWorldDimensions(it) },
{
it.registryOrThrow(Registries.WORLD_PRESET).getHolderOrThrow(WorldPresets.FLAT).value()
.createWorldDimensions()
},
screen,
)
}
@ -122,7 +125,7 @@ fun onServerTick(server: MinecraftServer) {
GameTestBatchFactory.fromTestFunction(GameTestRegistry.getAllTestFunctions(), server.overworld()),
server.overworld(),
)
.newStructureSpawner(StructureGridSpawner(BlockPos(0, -59, 0), 8))
.newStructureSpawner(StructureGridSpawner(TestHooks.getTestOrigin(server), 8))
.build()
val testTracker = MultipleTestTracker(tests.testInfos)
@ -140,6 +143,8 @@ fun testFinished() {
},
)
tests.start()
LOG.info("{} tests are now running!", testTracker.totalCount)
this.testTracker = testTracker
testTracker

7
projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt
View File

@ -55,6 +55,11 @@ fun init() {
}
}
fun getTestOrigin(server: MinecraftServer): BlockPos {
val spawn = server.overworld().sharedSpawnPos
return BlockPos(spawn.x, -59, spawn.y)
}
@JvmStatic
fun onServerStarted(server: MinecraftServer) {
val rules = server.gameRules
@ -64,7 +69,7 @@ fun onServerStarted(server: MinecraftServer) {
LOG.info("Cleaning up after last run")
val level = server.overworld()
StructureUtils.findStructureBlocks(BlockPos(0, -59, 0), 200, level).forEach { pos ->
StructureUtils.findStructureBlocks(getTestOrigin(server), 200, level).forEach { pos ->
val structure = level.getBlockEntity(pos) as StructureBlockEntity? ?: return@forEach
StructureUtils.clearSpaceForStructure(StructureUtils.getStructureBoundingBox(structure), level)
}