diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt index c2b11b319..ae4dce158 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt @@ -137,7 +137,7 @@ object BlockFactories : DefaultFactory>( Warped.Leaves, Warped.Door, Warped.Slab, SnowBlock, SnowLayerBlock, - FernBlock.DeadBush, FernBlock.Grass, FernBlock.Fern, + FernBlock.DeadBush, FernBlock.Grass, FernBlock.ShortGrass, FernBlock.Fern, DoublePlant.Sunflower, DoublePlant.Lilac, DoublePlant.TallGrass, DoublePlant.LargeFern, DoublePlant.RoseBush, DoublePlant.Peony, DoublePlant.UpperBlock, 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 c43ba72c4..d57407cae 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 @@ -24,7 +24,6 @@ import de.bixilon.minosoft.data.registries.blocks.types.properties.item.BlockWit import de.bixilon.minosoft.data.registries.blocks.types.properties.offset.RandomOffsetBlock import de.bixilon.minosoft.data.registries.blocks.types.properties.offset.RandomOffsetTypes import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.outline.OutlinedBlock -import de.bixilon.minosoft.data.registries.identified.AliasedIdentified import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.item.items.Item @@ -59,9 +58,17 @@ abstract class FernBlock(identifier: ResourceLocation, settings: BlockSettings) override val legacyModelName get() = minecraft("tall_grass") override val tintProvider: TintProvider? = null - companion object : BlockFactory, AliasedIdentified { + companion object : BlockFactory { override val identifier = minecraft("grass") - override val identifiers = setOf(minecraft("short_grass")) + + override fun build(registries: Registries, settings: BlockSettings) = Grass(settings = settings) + } + } + + open class ShortGrass(identifier: ResourceLocation = Companion.identifier, settings: BlockSettings) : Grass(identifier, settings) { + + companion object : BlockFactory { + override val identifier = minecraft("short_grass") override fun build(registries: Registries, settings: BlockSettings) = Grass(settings = settings) }