diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/factory/VerifyIntegratedBlockRegistry.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/factory/VerifyIntegratedBlockRegistry.kt index 7d9994d20..7bcc89069 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/factory/VerifyIntegratedBlockRegistry.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/factory/VerifyIntegratedBlockRegistry.kt @@ -169,6 +169,7 @@ object VerifyIntegratedBlockRegistry { if (error.isEmpty()) { return } + error.removePrefix("\n") Log.ERROR_PRINT_STREAM.println(error) throw AssertionError("Does not match, see above!") } diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockStateApplyTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockStateApplyTest.kt index f47b5dede..1821d7566 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockStateApplyTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockStateApplyTest.kt @@ -16,6 +16,7 @@ package de.bixilon.minosoft.gui.rendering.models import de.bixilon.kutil.cast.CastUtil.unsafeCast import de.bixilon.kutil.collections.CollectionUtil.extend 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.types.Block 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() 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!") } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/building/plants/FernBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/building/plants/FernBlock.kt index d57407cae..1640b3cc9 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/building/plants/FernBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/building/plants/FernBlock.kt @@ -67,10 +67,10 @@ abstract class FernBlock(identifier: ResourceLocation, settings: BlockSettings) open class ShortGrass(identifier: ResourceLocation = Companion.identifier, settings: BlockSettings) : Grass(identifier, settings) { - companion object : BlockFactory { + companion object : BlockFactory { 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) } }