Merge branch 'main' into modded-farmland-mulch

add back old farmland check
change way of mulch checking for farmland
2026-10-20 14:16:26 -04:00 · 2024-05-12 09:53:59 -04:00 · 2024-05-12 09:53:50 -04:00 · 2024-04-01 16:18:57 -04:00
1 changed files with 4 additions and 1 deletions
@@ -143,7 +143,10 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) :
        state: BlockState,
        variant: MulchVariant
    ): Boolean {
-        return getMulch(state) == MulchVariant.NONE && state.get(AGE) < FLOWER_AGE && world.getBlockState(pos.down()).isOf(Blocks.FARMLAND)
+        val plantedBlock = world.getBlockState(pos.down())
+        return getMulch(state) == MulchVariant.NONE &&
+                state.get(AGE) < FLOWER_AGE &&
+                (plantedBlock.block is FarmlandBlock || plantedBlock.isOf(Blocks.FARMLAND))
    }

    override fun applyMulch(
Author	SHA1	Message	Date
mia	e28400b7db	Merge branch 'main' into modded-farmland-mulch	2024-05-12 09:53:59 -04:00
mia	81c2465a7a	add back old farmland check	2024-05-12 09:53:50 -04:00
miasmus	7597fee7aa	change way of mulch checking for farmland	2024-04-01 16:18:57 -04:00