AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 01:48:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-27 19:46:59 +01:00
parent 354b647908
commit e29c466e8e
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/factory/VerifyIntegratedBlockRegistry.kt
View File

@ -169,6 +169,7 @@ object VerifyIntegratedBlockRegistry {
if (error.isEmpty()) { if (error.isEmpty()) {
return return
} }
error.removePrefix("\n")
Log.ERROR_PRINT_STREAM.println(error) Log.ERROR_PRINT_STREAM.println(error)
throw AssertionError("Does not match, see above!") throw AssertionError("Does not match, see above!")
} }

4
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockStateApplyTest.kt
View File

@ -16,6 +16,7 @@ package de.bixilon.minosoft.gui.rendering.models
import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.cast.CastUtil.unsafeCast
import de.bixilon.kutil.collections.CollectionUtil.extend import de.bixilon.kutil.collections.CollectionUtil.extend
import de.bixilon.kutil.reflection.ReflectionUtil.forceSet import de.bixilon.kutil.reflection.ReflectionUtil.forceSet
import de.bixilon.minosoft.assets.util.InputStreamUtil.readJsonObject
import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
import de.bixilon.minosoft.data.registries.blocks.types.Block import de.bixilon.minosoft.data.registries.blocks.types.Block
import de.bixilon.minosoft.data.registries.blocks.types.building.WoolBlock import de.bixilon.minosoft.data.registries.blocks.types.building.WoolBlock
@ -43,8 +44,9 @@ class BlockStateApplyTest {
val modelName = (if (block is CustomModel) block.getModelName(version) else block.identifier)!!.blockState() val modelName = (if (block is CustomModel) block.getModelName(version) else block.identifier)!!.blockState()
assets.push(modelName, state) assets.push(modelName, state)
val data = assets.getOrNull(block.identifier.blockState())?.readJsonObject()!!
return loader.block.loadState(block) ?: throw NullPointerException("empty block model!") return DirectBlockModel.deserialize(loader.block, block, data) ?: throw NullPointerException("empty block model!")
} }

4
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/building/plants/FernBlock.kt
View File

@ -67,10 +67,10 @@ abstract class FernBlock(identifier: ResourceLocation, settings: BlockSettings)
open class ShortGrass(identifier: ResourceLocation = Companion.identifier, settings: BlockSettings) : Grass(identifier, settings) { open class ShortGrass(identifier: ResourceLocation = Companion.identifier, settings: BlockSettings) : Grass(identifier, settings) {
companion object : BlockFactory<Grass> { companion object : BlockFactory<ShortGrass> {
override val identifier = minecraft("short_grass") override val identifier = minecraft("short_grass")
override fun build(registries: Registries, settings: BlockSettings) = Grass(settings = settings) override fun build(registries: Registries, settings: BlockSettings) = ShortGrass(settings = settings)
} }
} }